diff options
| author | Lev Rumyantsev <levarum@google.com> | 2018-05-25 18:35:55 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-25 18:35:55 -0700 |
| commit | f35eb333e7cc200f8bfc74090827139ffd8370f5 (patch) | |
| tree | 2b8c371c2544853a70e154c920b5a36fa52a320a | |
| parent | eeab47ecc6a22061023b649bf8e04e71939a15d7 (diff) | |
| parent | 47d00e960809f081a3410d4937ffb2725571bf62 (diff) | |
| download | v4l2_codec2-f35eb333e7cc200f8bfc74090827139ffd8370f5.tar.gz | |
Fix v4l2 tests after recent refactorings
am: 47d00e9608
Change-Id: I8aed751f5bba35259c571fd9f6e007740ae491b2
| -rw-r--r-- | cmds/Android.mk | 1 | ||||
| -rw-r--r-- | cmds/codec2.cpp | 2 | ||||
| -rw-r--r-- | tests/Android.mk | 2 | ||||
| -rw-r--r-- | tests/C2VDAComponent_test.cpp | 2 |
4 files changed, 5 insertions, 2 deletions
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 @@ LOCAL_C_INCLUDES += \ $(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 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> 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 @@ LOCAL_C_INCLUDES += \ $(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 @@ LOCAL_C_INCLUDES += \ $(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 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> |