Re-Add MIPS to Android CDM Build
(This is a merge of http://go/wvgerrit/14795) This change restores the ability to build the Widevine CDM for Android for MIPS devices. It restores the precompiled binaries for MIPS and re-adds MIPS to all makefiles. This change includes a new build of the obfuscated binaries for MIPS32r1 that were built using a MIPS device on the emulator. level3/mips/libwvlevel3.a Level3 Library Jun 19 2015 12:32:49 Bug: 19482469 Change-Id: Ifa1c299a5751f3772c42289d8333a2b8cec51f69
This commit is contained in:
@@ -106,7 +106,7 @@ LOCAL_MODULE_OWNER := widevine
|
|||||||
|
|
||||||
LOCAL_PROPRIETARY_MODULE := true
|
LOCAL_PROPRIETARY_MODULE := true
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
|
|||||||
@@ -34,6 +34,6 @@ LOCAL_SRC_FILES := \
|
|||||||
|
|
||||||
LOCAL_MODULE := libcdm
|
LOCAL_MODULE := libcdm
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|||||||
@@ -51,6 +51,6 @@ LOCAL_SHARED_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_CFLAGS += -DUNIT_TEST
|
LOCAL_CFLAGS += -DUNIT_TEST
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|||||||
BIN
libwvdrmengine/level3/mips/libwvlevel3.a
Normal file
BIN
libwvdrmengine/level3/mips/libwvlevel3.a
Normal file
Binary file not shown.
@@ -17,7 +17,7 @@ LOCAL_MODULE := libwvdrmcryptoplugin
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
LOCAL_STATIC_LIBRARIES := libcrypto_static
|
LOCAL_STATIC_LIBRARIES := libcrypto_static
|
||||||
|
|
||||||
|
|||||||
@@ -42,6 +42,6 @@ LOCAL_MODULE := libwvdrmmediacrypto_test
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := tests
|
LOCAL_MODULE_TAGS := tests
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|||||||
@@ -18,6 +18,6 @@ LOCAL_MODULE := libwvdrmdrmplugin
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := optional
|
LOCAL_MODULE_TAGS := optional
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|||||||
@@ -42,6 +42,6 @@ LOCAL_MODULE := libwvdrmdrmplugin_test
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := tests
|
LOCAL_MODULE_TAGS := tests
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ LOCAL_STATIC_LIBRARIES := \
|
|||||||
|
|
||||||
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
|
LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)
|
||||||
LOCAL_MODULE := liboemcrypto
|
LOCAL_MODULE := liboemcrypto
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ LOCAL_CLANG := false
|
|||||||
LOCAL_MODULE:=oemcrypto_test
|
LOCAL_MODULE:=oemcrypto_test
|
||||||
LOCAL_MODULE_TAGS := tests
|
LOCAL_MODULE_TAGS := tests
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(LOCAL_PATH)/common.mk
|
include $(LOCAL_PATH)/common.mk
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := gmock-all.cc
|
|||||||
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
||||||
LOCAL_CFLAGS += $(libgmock_cflags)
|
LOCAL_CFLAGS += $(libgmock_cflags)
|
||||||
LOCAL_MODULE := libgmock
|
LOCAL_MODULE := libgmock
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
@@ -43,5 +43,5 @@ LOCAL_SRC_FILES := gmock_main.cc
|
|||||||
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
LOCAL_C_INCLUDES := $(libgmock_target_includes)
|
||||||
LOCAL_CFLAGS += $(libgmock_cflags)
|
LOCAL_CFLAGS += $(libgmock_cflags)
|
||||||
LOCAL_MODULE := libgmock_main
|
LOCAL_MODULE := libgmock_main
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
include $(BUILD_STATIC_LIBRARY)
|
include $(BUILD_STATIC_LIBRARY)
|
||||||
|
|||||||
@@ -29,6 +29,6 @@ LOCAL_MODULE := libwvdrmengine_test
|
|||||||
|
|
||||||
LOCAL_MODULE_TAGS := tests
|
LOCAL_MODULE_TAGS := tests
|
||||||
|
|
||||||
LOCAL_MODULE_TARGET_ARCH := arm x86
|
LOCAL_MODULE_TARGET_ARCH := arm x86 mips
|
||||||
|
|
||||||
include $(BUILD_EXECUTABLE)
|
include $(BUILD_EXECUTABLE)
|
||||||
|
|||||||
Reference in New Issue
Block a user