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
This commit is contained in:
Vignesh Venkatasubramanian 2014-04-29 00:03:01 -07:00
parent 5573301dde
commit 4721f9efe9
3 changed files with 19 additions and 1 deletions

1
configure vendored
View File

@ -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-*)

View File

@ -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)

11
third_party/libwebm/Android.mk vendored Normal file
View File

@ -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)