From 0bbbf7d84e063e14ad08d37459287240329fc9eb Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Thu, 13 Jul 2017 18:27:12 -0700 Subject: [PATCH] Temporarily disable WV L1 For dogfooding, force fallback to widevine L3 bug:63673310 Change-Id: Ib222d4119e358ecfdaae44d1627d914a9b79d44e --- libwvdrmengine/Android.mk | 6 ++++++ libwvdrmengine/cdm/src/properties_android.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index f689ec44..d53414da 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -53,6 +53,12 @@ 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 b0356485..bcd48ca7 100644 --- a/libwvdrmengine/cdm/src/properties_android.cpp +++ b/libwvdrmengine/cdm/src/properties_android.cpp @@ -147,7 +147,11 @@ 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; }