generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "third_party/libwebm: Add Android.mk"

Browse Source
This commit is contained in:
Vignesh Venkatasubramanian 2014-05-02 11:39:29 -07:00 committed by Gerrit Code Review
commit 56186c2540
3 changed files with 19 additions and 1 deletions
configure
test/android
Android.mk
third_party/libwebm
Android.mk

1
configure vendored

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

8
test/android/Android.mk

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

11
third_party/libwebm/Android.mk vendored Normal 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)