DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107

This updates the Widevine Classic libraries to version 4.5.0.10107.
This version backports the bugfix for the IPv6 issue from JB-MR2.
Also, the Widevine build system has been updated to support all six
flavors. (2 security levels x 3 instruction sets)

This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.

Bug: 10246711
Change-Id: Ic0cf32ffd82fc8dacced84cecdee059afa1049ca
This commit is contained in:
John "Juce" Bruce
2013-09-20 10:54:36 -07:00
committed by Jeff Tinker
parent 0b56285a62
commit 071f699892
22 changed files with 59 additions and 9 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,4 +1,4 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
include $(call all-subdir-makefiles)

View File

@@ -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

Binary file not shown.

Binary file not shown.

View File

@@ -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)

View File

@@ -1,4 +1,4 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
include $(call all-subdir-makefiles)

View File

@@ -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

View File

@@ -1,4 +1,4 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
LOCAL_PATH:= $(call my-dir)

View File

@@ -1,4 +1,4 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
LOCAL_PATH := $(call my-dir)

View File

@@ -1,4 +1,4 @@
ifneq ($(filter arm x86,$(TARGET_ARCH)),)
ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),)
LOCAL_PATH:= $(call my-dir)