source/libvpx/test/android/Android.mk - Issue 1124333011: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/test/android/Android.mk

Issue 1124333011: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: only update to last nights LKGR Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/libvpx/test/android/Android.mk

diff --git a/source/libvpx/test/android/Android.mk b/source/libvpx/test/android/Android.mk

index 4e750b24b7410238a95100d1c911511a78686005..af85634556668a66eb48a3729d37a0baed92f2b9 100644

--- a/source/libvpx/test/android/Android.mk

+++ b/source/libvpx/test/android/Android.mk

@@ -40,7 +40,13 @@ include $(CLEAR_VARS)

LOCAL_ARM_MODE := arm

LOCAL_MODULE := libvpx_test

LOCAL_STATIC_LIBRARIES := gtest libwebm

-LOCAL_SHARED_LIBRARIES := vpx

+ifeq ($(ENABLE_SHARED),1)

+ LOCAL_SHARED_LIBRARIES := vpx

+else

+ LOCAL_STATIC_LIBRARIES += vpx

+endif

include $(LOCAL_PATH)/test/test.mk

LOCAL_C_INCLUDES := $(BINDINGS_DIR)

FILTERED_SRC := $(sort $(filter %.cc %.c, $(LIBVPX_TEST_SRCS-yes)))

« no previous file with comments | « source/libvpx/libs.mk ('k') | source/libvpx/test/blockiness_test.cc » ('j') | no next file with comments »