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

Merge "Add liboemcrypto.so as required by WV APEX"

Browse Source
This commit is contained in:
Kyle Zhang
2023-01-11 05:37:46 +00:00
committed by Android (Google) Code Review
parent d933e34824 a5c7a48f8a
commit a95cd36de5
8 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,16 +849,15 @@ class Adapter {
wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_NO_L1_LIBRARY_PATH);
return result;
}
if (level1_library_ == nullptr) {
if (!level1_library_) {
for (auto& name : library_names) {
level1_library_ = dlopen((name.c_str()), RTLD_NOW);
if (level1_library_) {
LOGV("Using oemcrypto path %s", name.c_str());
break;
if (!level1_library_) {
LOGW("Could not load oemcrypto from path %s. %s", name.c_str(), dlerror());
}
}
if (level1_library_ == nullptr) {
LOGW("Could not load oemcrypto. Falling back to L3. %s", dlerror());
if (!level1_library_) {
LOGW("Could not load oemcrypto. Falling back to L3.");
metrics.OemCryptoDynamicAdapterMetrics::SetInitializationMode(
wvcdm::metrics::OEMCrypto_INITIALIZED_USING_L3_L1_OPEN_FAILED);
return result;