From 07ce4f5a553fb5974de9d06e5ec3fc5aa666e312 Mon Sep 17 00:00:00 2001 From: Rahul Frias Date: Thu, 18 Jan 2018 14:41:41 -0800 Subject: [PATCH] Address x86 OEMCrypto compilation failures b/71650075 Test: Verified by wv unit/integration tests on taimen, compilation on aosp_x86, sdk_gphone_x86 Change-Id: I62c132f1a904e613ce5ea2734822f2d9580d22ef --- libwvdrmengine/level3/mips/Android.mk | 3 ++- libwvdrmengine/level3/mips64/Android.mk | 3 ++- libwvdrmengine/level3/x86/Android.mk | 1 + libwvdrmengine/level3/x86_64/Android.mk | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/level3/mips/Android.mk b/libwvdrmengine/level3/mips/Android.mk index bbc69a98..f6e62a7e 100644 --- a/libwvdrmengine/level3/mips/Android.mk +++ b/libwvdrmengine/level3/mips/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 := mips -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/level3/mips64/Android.mk b/libwvdrmengine/level3/mips64/Android.mk index 257c05c4..5e503dd8 100644 --- a/libwvdrmengine/level3/mips64/Android.mk +++ b/libwvdrmengine/level3/mips64/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 := mips64 -include $(BUILD_STATIC_LIBRARY) \ No newline at end of file +include $(BUILD_STATIC_LIBRARY) diff --git a/libwvdrmengine/level3/x86/Android.mk b/libwvdrmengine/level3/x86/Android.mk index de8f5b03..d63a2460 100644 --- a/libwvdrmengine/level3/x86/Android.mk +++ b/libwvdrmengine/level3/x86/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/x86_64/Android.mk b/libwvdrmengine/level3/x86_64/Android.mk index b721c00e..9039763d 100644 --- a/libwvdrmengine/level3/x86_64/Android.mk +++ b/libwvdrmengine/level3/x86_64/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