aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmds/Android.mk3
-rw-r--r--tests/Android.mk3
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)