From 4e53212b0ea8f240f4345170e81abc8efba8feab Mon Sep 17 00:00:00 2001 From: Thierry Strudel Date: Fri, 21 Jul 2017 23:41:49 +0000 Subject: [PATCH] Revert "Temporarily disable WV L1" This reverts commit 0bbbf7d84e063e14ad08d37459287240329fc9eb. Bug: 63632557 Change-Id: Icfd7ae4dda47449ad6178568c4bec18c898fa5b9 Signed-off-by: Thierry Strudel --- libwvdrmengine/Android.mk | 6 ------ libwvdrmengine/cdm/src/properties_android.cpp | 4 ---- 2 files changed, 10 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index d53414da..f689ec44 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -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 := \ diff --git a/libwvdrmengine/cdm/src/properties_android.cpp b/libwvdrmengine/cdm/src/properties_android.cpp index bcd48ca7..b0356485 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -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; }