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

diff --git a/configure b/configure
index 29683cd621ce7d06d30260942ddbce444e363ba7..690ac48fa7c6da4dbad1994b912d6e40cef02e99 100755 (executable)
--- a/configure
+++ b/configure
@@ -709,6 +709,7 @@ process_toolchain() {
             soft_enable webm_io
         ;;
         *-android-*)
+            soft_enable webm_io
             # GTestLog must be modified to use Android logging utilities.
         ;;
         *-darwin-*)

diff --git a/test/android/Android.mk b/test/android/Android.mk
index 13af601e2c54018fb88ae9b3be9d8a505623ad20..4e750b24b7410238a95100d1c911511a78686005 100644 (file)
--- 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)

diff --git a/third_party/libwebm/Android.mk b/third_party/libwebm/Android.mk
new file mode 100644 (file)
index 0000000..13868b6
--- /dev/null
+++ b/third_party/libwebm/Android.mk
@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := .cpp
+LOCAL_SRC_FILES := mkvmuxer.cpp \
+                   mkvmuxerutil.cpp \
+                   mkvparser.cpp \
+                   mkvreader.cpp \
+                   mkvwriter.cpp
+LOCAL_MODULE := libwebm
+include $(BUILD_STATIC_LIBRARY)