From 674a748f39cbdb6bb95bd389e7163f3af9832d35 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Wed, 17 Jan 2018 00:11:18 -0800 Subject: [PATCH] Compilation errors on taimen This adds an include path to system core properties.h to OEMCrypto L3 makefiles. Bug: 72004865 Test: Verified by unit/integration tests on taimen. Verified playback using Play Movies (streaming/offline) and Netflix. Change-Id: I73c21f2751b34b6b58d92ed5177951a6397b5bf7 --- libwvdrmengine/level3/arm/Android.mk | 1 + libwvdrmengine/level3/arm64/Android.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/level3/arm/Android.mk b/libwvdrmengine/level3/arm/Android.mk index 5317762c..97a33ebb 100644 --- a/libwvdrmengine/level3/arm/Android.mk +++ b/libwvdrmengine/level3/arm/Android.mk @@ -4,6 +4,7 @@ LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ -Wno-unused LOCAL_C_INCLUDES := \ + system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/oemcrypto/include diff --git a/libwvdrmengine/level3/arm64/Android.mk b/libwvdrmengine/level3/arm64/Android.mk index c5c5498b..3654ddf6 100644 --- a/libwvdrmengine/level3/arm64/Android.mk +++ b/libwvdrmengine/level3/arm64/Android.mk @@ -4,6 +4,7 @@ LOCAL_CFLAGS := \ -DDYNAMIC_ADAPTER \ -Wno-unused LOCAL_C_INCLUDES := \ + system/core/include \ vendor/widevine/libwvdrmengine/cdm/core/include \ vendor/widevine/libwvdrmengine/level3/include \ vendor/widevine/libwvdrmengine/oemcrypto/include @@ -18,4 +19,4 @@ LOCAL_PROPRIETARY_MODULE := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := widevine LOCAL_MODULE_TARGET_ARCH := arm64 -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY)