Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / libvpx / source / libvpx / test / android / Android.mk

diff --git a/src/third_party/libvpx/source/libvpx/test/android/Android.mk b/src/third_party/libvpx/source/libvpx/test/android/Android.mk
index 13af601..4e750b2 100644 (file)
--- a/src/third_party/libvpx/source/libvpx/test/android/Android.mk
+++ b/src/third_party/libvpx/source/libvpx/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)