commit 47d00e960809f081a3410d4937ffb2725571bf62
author Lev Rumyantsev <levarum@google.com> Fri May 25 16:53:02 2018 -0700
committer Lev Rumyantsev <levarum@google.com> Fri May 25 16:54:10 2018 -0700
tree 2b8c371c2544853a70e154c920b5a36fa52a320a
parent 7c20212ff1be71902a0cc4c760700730935c9ebf

Fix v4l2 tests after recent refactorings

Test: m -j40 C2VDACompIntf_test C2VDAComponent_test v4l2_codec2_testapp
Bug: 80265473
Change-Id: I2fff49d2673532cb34df5fadbe1b73b1061c3ba9

cmds/Android.mk

diff --git a/cmds/Android.mk b/cmds/Android.mk
index 3f015d9..6cc84ae 100644
--- a/cmds/Android.mk
+++ b/cmds/Android.mk
@@ -13,6 +13,7 @@
         $(TOP)/frameworks/native/include \
         $(TOP)/hardware/google/av/codec2/include \
         $(TOP)/hardware/google/av/codec2/vndk/include \
+	$(TOP)/hardware/google/av/media/codecs/base/include \
 
 LOCAL_MODULE := v4l2_codec2_testapp
 LOCAL_MODULE_TAGS := optional

cmds/codec2.cpp

diff --git a/cmds/codec2.cpp b/cmds/codec2.cpp
index 0fc21c1..9458bd3 100644
--- a/cmds/codec2.cpp
+++ b/cmds/codec2.cpp
@@ -12,7 +12,7 @@
 #include <C2Component.h>
 #include <C2PlatformSupport.h>
 #include <C2Work.h>
-#include <SimpleInterfaceCommon.h>
+#include <SimpleC2Interface.h>
 
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index eefbf91..4bafb4a 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -25,6 +25,7 @@
   $(TOP)/external/v4l2_codec2/vda \
   $(TOP)/hardware/google/av/codec2/include \
   $(TOP)/hardware/google/av/codec2/vndk/include \
+  $(TOP)/hardware/google/av/media/codecs/base/include \
 
 LOCAL_CFLAGS += -Werror -Wall -std=c++14
 LOCAL_CLANG := true
@@ -66,6 +67,7 @@
   $(TOP)/frameworks/av/media/libstagefright/include \
   $(TOP)/hardware/google/av/codec2/include \
   $(TOP)/hardware/google/av/codec2/vndk/include \
+  $(TOP)/hardware/google/av/media/codecs/base/include \
 
 # -Wno-unused-parameter is needed for libchrome/base codes
 LOCAL_CFLAGS += -Werror -Wall -Wno-unused-parameter -std=c++14

tests/C2VDAComponent_test.cpp

diff --git a/tests/C2VDAComponent_test.cpp b/tests/C2VDAComponent_test.cpp
index 14087f7..5e597c8 100644
--- a/tests/C2VDAComponent_test.cpp
+++ b/tests/C2VDAComponent_test.cpp
@@ -12,7 +12,7 @@
 #include <C2Component.h>
 #include <C2PlatformSupport.h>
 #include <C2Work.h>
-#include <SimpleInterfaceCommon.h>
+#include <SimpleC2Interface.h>
 
 #include <base/files/file.h>
 #include <base/files/file_path.h>