diff options
| author | Johny Lin <johnylin@google.com> | 2018-01-25 22:08:39 +0800 |
|---|---|---|
| committer | Johny Lin <johnylin@google.com> | 2018-01-25 22:56:30 +0800 |
| commit | 7f197c259d869d660c7a49900aa8043dc585d622 (patch) | |
| tree | b5938d2b8ce0b657a068fee0301d88666a9524ba | |
| parent | 192552e2fabf6ad2c7ad5ba368dbd79b267d80b2 (diff) | |
| download | v4l2_codec2-7f197c259d869d660c7a49900aa8043dc585d622.tar.gz | |
codec2: avoid including libmediaextractor for ARC++N
MediaBufferXXX is moved from foundation to libmediaextractor on master.
Bug: 67908542
Test: mmm external/v4l2_codec2 on both ARC++N and ARC++P
Change-Id: I2d19d9ebe28f800ad4fb66432ec380295d5cee44
| -rw-r--r-- | cmds/Android.mk | 3 | ||||
| -rw-r--r-- | tests/Android.mk | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmds/Android.mk b/cmds/Android.mk index 3d961d9..bcbde29 100644 --- a/cmds/Android.mk +++ b/cmds/Android.mk @@ -24,7 +24,6 @@ LOCAL_SHARED_LIBRARIES := libbinder \ libgui \ liblog \ libmedia \ - libmediaextractor \ libstagefright \ libstagefright_codec2 \ libstagefright_foundation \ @@ -44,6 +43,8 @@ ANDROID_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) ifeq ($(ANDROID_VERSION),7) # NYC LOCAL_CFLAGS += -DANDROID_VERSION_NYC +else +LOCAL_SHARED_LIBRARIES += libmediaextractor endif include $(BUILD_EXECUTABLE) diff --git a/tests/Android.mk b/tests/Android.mk index b65c234..728bcbb 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -46,7 +46,6 @@ LOCAL_SHARED_LIBRARIES := \ libcutils \ liblog \ libmedia \ - libmediaextractor \ libstagefright \ libstagefright_codec2 \ libstagefright_codec2_vndk \ @@ -74,6 +73,8 @@ ANDROID_VERSION := $(word 1, $(subst ., , $(PLATFORM_VERSION))) ifeq ($(ANDROID_VERSION),7) # NYC LOCAL_CFLAGS += -DANDROID_VERSION_NYC +else +LOCAL_SHARED_LIBRARIES += libmediaextractor endif include $(BUILD_NATIVE_TEST) |