widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clean up oemcrypto dynamic adapter and add level 3 libraries"

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2017-03-02 02:48:43 +00:00
committed by Android (Google) Code Review
parent 3b7b2c91c1 27c01e82b5
commit 848d851441
12 changed files with 343 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

580
libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
View File

File diff suppressed because it is too large Load Diff

BIN
libwvdrmengine/level3/arm/libwvlevel3.a
View File

Binary file not shown.

11
libwvdrmengine/level3/arm64/Android.mk Normal file
View File

@@ -0,0 +1,11 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libwvlevel3
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE_SUFFIX := .a
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := arm64
include $(BUILD_PREBUILT)

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

Binary file not shown.

1
libwvdrmengine/level3/mips/Android.mk
View File

@@ -1,5 +1,4 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libwvlevel3 LOCAL_MODULE := libwvlevel3
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES

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

Binary file not shown.

11
libwvdrmengine/level3/mips64/Android.mk Normal file
View File

@@ -0,0 +1,11 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libwvlevel3
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE_SUFFIX := .a
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := mips64
include $(BUILD_PREBUILT)

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

Binary file not shown.

BIN
libwvdrmengine/level3/x86/libwvlevel3.a
View File

Binary file not shown.

11
libwvdrmengine/level3/x86_64/Android.mk Normal file
View File

@@ -0,0 +1,11 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libwvlevel3
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE_SUFFIX := .a
LOCAL_SRC_FILES := $(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
LOCAL_PROPRIETARY_MODULE := true
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_OWNER := widevine
LOCAL_MODULE_TARGET_ARCH := x86_64
include $(BUILD_PREBUILT)

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

Binary file not shown.

2
libwvdrmengine/oemcrypto/include/OEMCryptoCENC.h
View File

@@ -371,7 +371,7 @@ typedef enum OEMCrypto_ProvisioningMethod {
#define OEMCrypto_GetHDCPCapability _oecc44 #define OEMCrypto_GetHDCPCapability _oecc44
#define OEMCrypto_LoadTestRSAKey _oecc45 #define OEMCrypto_LoadTestRSAKey _oecc45
#define OEMCrypto_Security_Patch_Level _oecc46 #define OEMCrypto_Security_Patch_Level _oecc46
#define OEMCrypto_LoadKeys_V12 _oecc47 #define OEMCrypto_LoadKeys_V11_or_V12 _oecc47
#define OEMCrypto_DecryptCENC _oecc48 #define OEMCrypto_DecryptCENC _oecc48
#define OEMCrypto_GetProvisioningMethod _oecc49 #define OEMCrypto_GetProvisioningMethod _oecc49
#define OEMCrypto_GetOEMPublicCertificate _oecc50 #define OEMCrypto_GetOEMPublicCertificate _oecc50