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

Revert "Temporarily disable WV L1"

Browse Source 
am: 4e53212b0e

Change-Id: I497aa043991af370babe49e02f9828f4f0281dc9
This commit is contained in:
Thierry Strudel
2017-07-24 06:14:00 +00:00
committed by android-build-merger
parent f0491381d6 4e53212b0e
commit 0bb98237cd
2 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libwvdrmengine/Android.mk
View File

@@ -53,12 +53,6 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/include \ vendor/widevine/libwvdrmengine/oemcrypto/include \
vendor/widevine/libwvdrmengine/third_party/stringencoders/src vendor/widevine/libwvdrmengine/third_party/stringencoders/src
# Until level 1 is working on walleye/taimen we've been asked to disable it for dogfooding
ifeq (,$(filter-out aosp_walleye% walleye% aosp_taimen% taimen%, $(TARGET_PRODUCT)))
LOCAL_CFLAGS := -DDISABLE_OEMCRYPTO_LEVEL_1
endif
SRC_DIR := cdm/src SRC_DIR := cdm/src
CORE_SRC_DIR := cdm/core/src CORE_SRC_DIR := cdm/core/src
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \

4
libwvdrmengine/cdm/src/properties_android.cpp
View File

@@ -147,11 +147,7 @@ bool Properties::GetOEMCryptoPath(std::string* library_name) {
LOGW("Properties::GetOEMCryptoPath: Invalid parameter"); LOGW("Properties::GetOEMCryptoPath: Invalid parameter");
return false; return false;
} }
#ifdef DISABLE_OEMCRYPTO_LEVEL_1
#warning !!!! OEMCRYPTO LEVEL 1 IS DISABLED!!!
#else
*library_name = "liboemcrypto.so"; *library_name = "liboemcrypto.so";
#endif
return true; return true;
} }