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

Snap for 11747462 from 874fbfff5f to vic-widevine-partner-release

Browse Source 
Change-Id: I74388e403d4bc5aba8fa7cef6b490683b44785d6
This commit is contained in:
Android Build Coastguard Worker
2024-04-22 22:12:01 +00:00
parent b30452a3f6 874fbfff5f
commit 304f15c60a
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libwvdrmengine/apex/prebuilt/Android.bp
View File

@@ -25,27 +25,39 @@ package {
default_applicable_licenses: ["vendor_widevine_license"], default_applicable_licenses: ["vendor_widevine_license"],
} }
apex_set { soong_config_module_type {
name: "widevine_apex_set",
module_type: "apex_set",
config_namespace: "widevine",
bool_variables: ["source_build"],
properties: ["prefer"],
}
widevine_apex_set {
name: "com.google.android.widevine.nonupdatable", name: "com.google.android.widevine.nonupdatable",
apex_name: "com.google.android.widevine", apex_name: "com.google.android.widevine",
owner: "google", owner: "google",
set: "com.google.android.widevine.nonupdatable.apks", set: "com.google.android.widevine.nonupdatable.apks",
vendor: true, vendor: true,
use_source_config_var: { prefer: true,
config_namespace: "widevine", soong_config_variables: {
var_name: "source_build", source_build: {
prefer: false,
},
}, },
} }
apex_set { widevine_apex_set {
name: "com.google.android.widevine.lazy", name: "com.google.android.widevine.lazy",
apex_name: "com.google.android.widevine.lazy", apex_name: "com.google.android.widevine.lazy",
owner: "google", owner: "google",
set: "com.google.android.widevine.lazy.apks", set: "com.google.android.widevine.lazy.apks",
vendor: true, vendor: true,
use_source_config_var: { prefer: true,
config_namespace: "widevine", soong_config_variables: {
var_name: "source_build", source_build: {
prefer: false,
},
}, },
} }

2
libwvdrmengine/oemcrypto/test/oec_session_util.cpp
View File

@@ -1414,6 +1414,7 @@ void EntitledMessage::LoadCasKeys(bool load_even, bool load_odd,
even_key.content_key_data_iv = entitled_key_array_[0].content_key_data_iv; even_key.content_key_data_iv = entitled_key_array_[0].content_key_data_iv;
even_key.content_key_data = entitled_key_array_[0].content_key_data; even_key.content_key_data = entitled_key_array_[0].content_key_data;
even_key.content_iv = entitled_key_array_[0].content_iv; even_key.content_iv = entitled_key_array_[0].content_iv;
even_key.cipher_mode = OEMCrypto_CipherMode_CBC;
} }
if (has_odd) { if (has_odd) {
odd_key.entitlement_key_id = entitled_key_array_[1].entitlement_key_id; odd_key.entitlement_key_id = entitled_key_array_[1].entitlement_key_id;
@@ -1421,6 +1422,7 @@ void EntitledMessage::LoadCasKeys(bool load_even, bool load_odd,
odd_key.content_key_data_iv = entitled_key_array_[1].content_key_data_iv; odd_key.content_key_data_iv = entitled_key_array_[1].content_key_data_iv;
odd_key.content_key_data = entitled_key_array_[1].content_key_data; odd_key.content_key_data = entitled_key_array_[1].content_key_data;
odd_key.content_iv = entitled_key_array_[1].content_iv; odd_key.content_iv = entitled_key_array_[1].content_iv;
odd_key.cipher_mode = OEMCrypto_CipherMode_CBC;
} }
OEMCryptoResult sts = OEMCrypto_LoadCasECMKeys( OEMCryptoResult sts = OEMCrypto_LoadCasECMKeys(