am 470fb26f: am 071f6998: DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107

* commit '470fb26f7201e0f3161e5f0aea95743ad5d4aa11':
  DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107

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

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

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)
 

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

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)

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)
 

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

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)
 

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)
 

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)