diff --git a/proprietary/Android.mk b/proprietary/Android.mk index 5648b551..bcca3d24 100644 --- a/proprietary/Android.mk +++ b/proprietary/Android.mk @@ -1,9 +1,9 @@ # widevine prebuilts only available for ARM # To build this dir you must define BOARD_WIDEVINE_OEMCRYPTO_LEVEL in the board config. ifdef BOARD_WIDEVINE_OEMCRYPTO_LEVEL -ifeq ($(TARGET_ARCH),arm) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) include $(call all-subdir-makefiles) -endif # TARGET_ARCH == arm, x86 +endif # TARGET_ARCH == arm, x86, mips endif # BOARD_WIDEVINE_OEMCRYPTO_LEVEL diff --git a/proprietary/drmwvmplugin/Android.mk b/proprietary/drmwvmplugin/Android.mk index 74e2d29e..2e24ba21 100644 --- a/proprietary/drmwvmplugin/Android.mk +++ b/proprietary/drmwvmplugin/Android.mk @@ -31,7 +31,7 @@ include $(BUILD_JAVA_LIBRARY) ######################## -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) include $(CLEAR_VARS) include $(TOP)/vendor/widevine/proprietary/drmwvmplugin/common.mk diff --git a/proprietary/drmwvmplugin/lib/Android.mk b/proprietary/drmwvmplugin/lib/Android.mk index 8a9c12a2..743588c0 100644 --- a/proprietary/drmwvmplugin/lib/Android.mk +++ b/proprietary/drmwvmplugin/lib/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) include $(call all-subdir-makefiles) diff --git a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so index e431c6fb..b72a6b71 100755 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so and b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so index 5cac5e41..51a42220 100755 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so and b/proprietary/drmwvmplugin/lib/arm/libwvdrm_L3.so differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a index 74d9e687..bbaf94fd 100644 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a and b/proprietary/drmwvmplugin/lib/arm/libwvocs_L1.a differ diff --git a/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a index 39d11268..99699ccd 100644 Binary files a/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a and b/proprietary/drmwvmplugin/lib/arm/libwvocs_L3.a differ diff --git a/proprietary/drmwvmplugin/lib/mips/Android.mk b/proprietary/drmwvmplugin/lib/mips/Android.mk new file mode 100644 index 00000000..1cadab1c --- /dev/null +++ b/proprietary/drmwvmplugin/lib/mips/Android.mk @@ -0,0 +1,33 @@ +ifeq ($(TARGET_ARCH),mips) + +LOCAL_PATH:= $(call my-dir) + +######################################################################### +# libwvdrm_L?.so + +include $(CLEAR_VARS) + +LOCAL_MODULE := libwvdrm_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +######################################################################### +# libwvocs_L?.a + +include $(CLEAR_VARS) + +LOCAL_MODULE := libwvocs_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE_SUFFIX := .a +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/drmwvmplugin/lib/mips/libwvdrm_L3.so b/proprietary/drmwvmplugin/lib/mips/libwvdrm_L3.so new file mode 100755 index 00000000..a949298a Binary files /dev/null and b/proprietary/drmwvmplugin/lib/mips/libwvdrm_L3.so differ diff --git a/proprietary/drmwvmplugin/lib/mips/libwvocs_L3.a b/proprietary/drmwvmplugin/lib/mips/libwvocs_L3.a new file mode 100644 index 00000000..8ae20ee9 Binary files /dev/null and b/proprietary/drmwvmplugin/lib/mips/libwvocs_L3.a differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so index f4a91600..ebb3958f 100755 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so and b/proprietary/drmwvmplugin/lib/x86/libwvdrm_L1.so differ diff --git a/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a b/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a index ea6e6cb5..c8d919a7 100644 Binary files a/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a and b/proprietary/drmwvmplugin/lib/x86/libwvocs_L1.a differ diff --git a/proprietary/drmwvmplugin/test/Android.mk b/proprietary/drmwvmplugin/test/Android.mk index 1e1e1285..4f38e2c7 100644 --- a/proprietary/drmwvmplugin/test/Android.mk +++ b/proprietary/drmwvmplugin/test/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) diff --git a/proprietary/streamcontrol/lib/Android.mk b/proprietary/streamcontrol/lib/Android.mk index 8a9c12a2..743588c0 100644 --- a/proprietary/streamcontrol/lib/Android.mk +++ b/proprietary/streamcontrol/lib/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) include $(call all-subdir-makefiles) diff --git a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so index 7d0c62c8..a32d8a1c 100755 Binary files a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so and b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so differ diff --git a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so index f5638373..dd1d5354 100755 Binary files a/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so and b/proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L3.so differ diff --git a/proprietary/streamcontrol/lib/mips/Android.mk b/proprietary/streamcontrol/lib/mips/Android.mk new file mode 100644 index 00000000..f7d18b56 --- /dev/null +++ b/proprietary/streamcontrol/lib/mips/Android.mk @@ -0,0 +1,17 @@ +ifeq ($(TARGET_ARCH),mips) + +LOCAL_PATH:= $(call my-dir) + +include $(CLEAR_VARS) + +LOCAL_MODULE := libWVStreamControlAPI_L$(BOARD_WIDEVINE_OEMCRYPTO_LEVEL) +LOCAL_MODULE_CLASS := SHARED_LIBRARIES +LOCAL_MODULE_SUFFIX := .so +LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX) +LOCAL_PROPRIETARY_MODULE := true +LOCAL_STRIP_MODULE := true + +LOCAL_MODULE_TAGS := optional +include $(BUILD_PREBUILT) + +endif diff --git a/proprietary/streamcontrol/lib/mips/libWVStreamControlAPI_L3.so b/proprietary/streamcontrol/lib/mips/libWVStreamControlAPI_L3.so new file mode 100755 index 00000000..cd491d43 Binary files /dev/null and b/proprietary/streamcontrol/lib/mips/libWVStreamControlAPI_L3.so differ diff --git a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so index cd7c64ba..284ff69d 100755 Binary files a/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so and b/proprietary/streamcontrol/lib/x86/libWVStreamControlAPI_L1.so differ diff --git a/proprietary/streamcontrol/test/Android.mk b/proprietary/streamcontrol/test/Android.mk index 082be797..aeb3ed3f 100644 --- a/proprietary/streamcontrol/test/Android.mk +++ b/proprietary/streamcontrol/test/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir) diff --git a/proprietary/wvm/Android.mk b/proprietary/wvm/Android.mk index a19d1d73..fb18c15b 100644 --- a/proprietary/wvm/Android.mk +++ b/proprietary/wvm/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) LOCAL_PATH := $(call my-dir) diff --git a/proprietary/wvm/test/Android.mk b/proprietary/wvm/test/Android.mk index aa15b53c..1117e0a8 100644 --- a/proprietary/wvm/test/Android.mk +++ b/proprietary/wvm/test/Android.mk @@ -1,4 +1,4 @@ -ifneq ($(filter arm x86,$(TARGET_ARCH)),) +ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) LOCAL_PATH:= $(call my-dir)