From 3a7ebf9c36a1e74190aa9820421c8fc8ac051ea0 Mon Sep 17 00:00:00 2001
From: Frank Galligan <fgalligan@google.com>
Date: Fri, 17 Apr 2015 10:59:11 -0700
Subject: [PATCH] Fix dependency of android vpx test application.

Change-Id: I32b7c92c89c9a2be0cf38e67a17266b9d3866154
---
 test/android/Android.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/android/Android.mk b/test/android/Android.mk
index 4e750b24b..af8563455 100644
--- a/test/android/Android.mk
+++ b/test/android/Android.mk
@@ -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)))