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

2
libwvdrmengine/Android.mk
View File

@@ -106,7 +106,7 @@ LOCAL_MODULE_OWNER := widevine
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_SHARED_LIBRARY)

2
libwvdrmengine/cdm/Android.mk
View File

@@ -34,6 +34,6 @@ LOCAL_SRC_FILES := \
LOCAL_MODULE := libcdm
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_STATIC_LIBRARY)

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -51,6 +51,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_CFLAGS += -DUNIT_TEST
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE)

BIN
libwvdrmengine/level3/mips/libwvlevel3.a Normal file
View File

Binary file not shown.

2
libwvdrmengine/mediacrypto/Android.mk
View File

@@ -17,7 +17,7 @@ LOCAL_MODULE := libwvdrmcryptoplugin
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
LOCAL_STATIC_LIBRARIES := libcrypto_static

2
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -42,6 +42,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_test
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE)

2
libwvdrmengine/mediadrm/Android.mk
View File

@@ -18,6 +18,6 @@ LOCAL_MODULE := libwvdrmdrmplugin
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_STATIC_LIBRARY)

2
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -42,6 +42,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_test
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE)

2
libwvdrmengine/oemcrypto/mock/Android.mk
View File

@@ -37,7 +37,7 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
LOCAL_MODULE := liboemcrypto
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_SHARED_LIBRARY)

2
libwvdrmengine/oemcrypto/test/Android.mk
View File

@@ -7,7 +7,7 @@ LOCAL_CLANG := false
LOCAL_MODULE:=oemcrypto_test
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(LOCAL_PATH)/common.mk

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)

2
libwvdrmengine/test/unit/Android.mk
View File

@@ -29,6 +29,6 @@ LOCAL_MODULE := libwvdrmengine_test
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE_TARGET_ARCH := arm x86
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
include $(BUILD_EXECUTABLE)