summaryrefslogtreecommitdiff
path: root/test/android/Android.mk
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv@google.com>2014-04-29 00:03:01 -0700
committerVignesh Venkatasubramanian <vigneshv@google.com>2014-04-29 11:22:04 -0700
commit4721f9efe9d105b5c58ecb0ef71ff653f9f3cd05 (patch)
tree1fad7ccb6eb5c3a99f45ead9a6a28e5ef3b2b867 /test/android/Android.mk
parent5573301ddee1f8d60489a8532fb96599bd6715a3 (diff)
downloadlibvpx-4721f9efe9d105b5c58ecb0ef71ff653f9f3cd05.tar
libvpx-4721f9efe9d105b5c58ecb0ef71ff653f9f3cd05.tar.gz
libvpx-4721f9efe9d105b5c58ecb0ef71ff653f9f3cd05.tar.bz2
libvpx-4721f9efe9d105b5c58ecb0ef71ff653f9f3cd05.zip
third_party/libwebm: Add Android.mk
Add Android.mk for libwebm so that unit tests involving WebM I/O can be built for android. Change-Id: I56db0f75672e28c22e559cc415e1d5c26ff0ceb5
Diffstat (limited to 'test/android/Android.mk')
-rw-r--r--test/android/Android.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/test/android/Android.mk b/test/android/Android.mk
index 13af601e2..4e750b24b 100644
--- a/test/android/Android.mk
+++ b/test/android/Android.mk
@@ -14,8 +14,14 @@ CUR_WD := $(call my-dir)
BINDINGS_DIR := $(CUR_WD)/../../..
LOCAL_PATH := $(CUR_WD)/../../..
+#libwebm
+include $(CLEAR_VARS)
+include $(BINDINGS_DIR)/libvpx/third_party/libwebm/Android.mk
+LOCAL_PATH := $(CUR_WD)/../../..
+
#libvpx
include $(CLEAR_VARS)
+LOCAL_STATIC_LIBRARIES := libwebm
include $(BINDINGS_DIR)/libvpx/build/make/Android.mk
LOCAL_PATH := $(CUR_WD)/../..
@@ -33,7 +39,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm
LOCAL_MODULE := libvpx_test
-LOCAL_STATIC_LIBRARIES := gtest
+LOCAL_STATIC_LIBRARIES := gtest libwebm
LOCAL_SHARED_LIBRARIES := vpx
include $(LOCAL_PATH)/test/test.mk
LOCAL_C_INCLUDES := $(BINDINGS_DIR)