widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 256dd1a5 to master

Browse Source 
Change-Id: Iffef557a3d9d3df321b5ae38e891d5a2a3e88e70
This commit is contained in:
John "Juce" Bruce
2015-06-19 19:49:36 -07:00
parent 88c3e74f08 256dd1a5b4
commit 5bd0e73b3e
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/test/gmock/src/Android.mk
View File

@@ -35,7 +35,7 @@ LOCAL_SRC_FILES := gmock-all.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libwvgmock
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_STATIC_LIBRARY)
#######################################################################
@@ -46,5 +46,5 @@ LOCAL_SRC_FILES := gmock_main.cc
LOCAL_C_INCLUDES := $(libgmock_target_includes)
LOCAL_CFLAGS += $(libgmock_cflags)
LOCAL_MODULE := libwvgmock_main
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_STATIC_LIBRARY)