Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
56186c25
Commit
56186c25
authored
May 02, 2014
by
Vignesh Venkatasubramanian
Committed by
Gerrit Code Review
May 02, 2014
Browse files
Merge "third_party/libwebm: Add Android.mk"
parents
dea687f7
4721f9ef
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure
View file @
56186c25
...
...
@@ -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-
*
)
...
...
test/android/Android.mk
View file @
56186c25
...
...
@@ -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)
...
...
third_party/libwebm/Android.mk
0 → 100644
View file @
56186c25
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)
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment