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

Revert "Temporarily disable WV L1"

Browse Source 
This reverts commit 0bbbf7d84e.

Bug: 63632557
Change-Id: Icfd7ae4dda47449ad6178568c4bec18c898fa5b9
Signed-off-by: Thierry Strudel <tstrudel@google.com>
This commit is contained in:
Thierry Strudel
2017-07-21 23:41:49 +00:00
parent bfef9c5748
commit 4e53212b0e
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/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
CORE_SRC_DIR := cdm/core/src
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");
return false;
}
#ifdef DISABLE_OEMCRYPTO_LEVEL_1
#warning !!!! OEMCRYPTO LEVEL 1 IS DISABLED!!!
#else
*library_name = "liboemcrypto.so";
#endif
return true;
}