]> granicus.if.org Git - libvpx/commitdiff
Fix dependency of android vpx test application.
authorFrank Galligan <fgalligan@google.com>
Fri, 17 Apr 2015 17:59:11 +0000 (10:59 -0700)
committerFrank Galligan <fgalligan@google.com>
Fri, 17 Apr 2015 17:59:11 +0000 (10:59 -0700)
Change-Id: I32b7c92c89c9a2be0cf38e67a17266b9d3866154

test/android/Android.mk

index 4e750b24b7410238a95100d1c911511a78686005..af85634556668a66eb48a3729d37a0baed92f2b9 100644 (file)
@@ -40,7 +40,13 @@ include $(CLEAR_VARS)
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE := libvpx_test
 LOCAL_STATIC_LIBRARIES := gtest libwebm
-LOCAL_SHARED_LIBRARIES := vpx
+
+ifeq ($(ENABLE_SHARED),1)
+  LOCAL_SHARED_LIBRARIES := vpx
+else
+  LOCAL_STATIC_LIBRARIES += vpx
+endif
+
 include $(LOCAL_PATH)/test/test.mk
 LOCAL_C_INCLUDES := $(BINDINGS_DIR)
 FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes)))