Commit 4721f9ef authored by Vignesh Venkatasubramanian's avatar Vignesh Venkatasubramanian
Browse files

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
Showing with 19 additions and 1 deletion
...@@ -709,6 +709,7 @@ process_toolchain() { ...@@ -709,6 +709,7 @@ process_toolchain() {
soft_enable webm_io soft_enable webm_io
;; ;;
*-android-*) *-android-*)
soft_enable webm_io
# GTestLog must be modified to use Android logging utilities. # GTestLog must be modified to use Android logging utilities.
;; ;;
*-darwin-*) *-darwin-*)
......
...@@ -14,8 +14,14 @@ CUR_WD := $(call my-dir) ...@@ -14,8 +14,14 @@ CUR_WD := $(call my-dir)
BINDINGS_DIR := $(CUR_WD)/../../.. BINDINGS_DIR := $(CUR_WD)/../../..
LOCAL_PATH := $(CUR_WD)/../../.. LOCAL_PATH := $(CUR_WD)/../../..
#libwebm
include $(CLEAR_VARS)
include $(BINDINGS_DIR)/libvpx/third_party/libwebm/Android.mk
LOCAL_PATH := $(CUR_WD)/../../..
#libvpx #libvpx
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_STATIC_LIBRARIES := libwebm
include $(BINDINGS_DIR)/libvpx/build/make/Android.mk include $(BINDINGS_DIR)/libvpx/build/make/Android.mk
LOCAL_PATH := $(CUR_WD)/../.. LOCAL_PATH := $(CUR_WD)/../..
...@@ -33,7 +39,7 @@ include $(BUILD_STATIC_LIBRARY) ...@@ -33,7 +39,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
LOCAL_MODULE := libvpx_test LOCAL_MODULE := libvpx_test
LOCAL_STATIC_LIBRARIES := gtest LOCAL_STATIC_LIBRARIES := gtest libwebm
LOCAL_SHARED_LIBRARIES := vpx LOCAL_SHARED_LIBRARIES := vpx
include $(LOCAL_PATH)/test/test.mk include $(LOCAL_PATH)/test/test.mk
LOCAL_C_INCLUDES := $(BINDINGS_DIR) LOCAL_C_INCLUDES := $(BINDINGS_DIR)
......
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)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment