From 8af30972b265ce78993dafbe5e208f72cd40863f Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 7 Jan 2020 11:33:57 -0800 Subject: [PATCH] Link with actual headers instead of symlinks Bug: 143245419 Test: build Change-Id: Iff096c2d3568f2db4260a1d2a86d2746ea4824ed --- libwvdrmengine/Android.mk | 3 +++ libwvdrmengine/mediacrypto/Android.mk | 1 + libwvdrmengine/mediadrm/Android.mk | 4 +++- libwvdrmengine/mediadrm/test/Android.mk | 6 ++++++ libwvdrmengine/test/unit/Android.mk | 6 ++++++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 9b7c8328..6f258625 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -245,6 +245,9 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ + LOCAL_MODULE := libwvhidl LOCAL_MODULE_TAGS := optional diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index 348380a0..a3ac23ee 100644 --- a/libwvdrmengine/mediacrypto/Android.mk +++ b/libwvdrmengine/mediacrypto/Android.mk @@ -20,6 +20,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ libutils_headers LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index 3dbbaf73..a2740f26 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -21,7 +21,8 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ - libutils_headers + libstagefright_foundation_headers \ + libutils_headers \ LOCAL_SHARED_LIBRARIES := \ liblog @@ -60,6 +61,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ libutils_headers \ LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 28473543..907231c2 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -38,6 +38,9 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ + LOCAL_C_INCLUDES += \ external/protobuf/src \ @@ -105,6 +108,9 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ + LOCAL_C_INCLUDES += \ external/protobuf/src \ diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index 4a95dc57..b3b94ffb 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -28,6 +28,9 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libwvdrmengine \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ + LOCAL_MODULE := libwvdrmengine_test LOCAL_MODULE_TAGS := tests @@ -81,6 +84,9 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ libwvhidl \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_foundation_headers \ + LOCAL_MODULE := libwvdrmengine_hidl_test LOCAL_MODULE_TAGS := tests