From 13a2504840c32a7df6386b7fba446ac24d04ce04 Mon Sep 17 00:00:00 2001 From: Marco Nelissen Date: Tue, 7 Jan 2020 15:26:14 -0800 Subject: [PATCH] Link with actual headers instead of symlinks Bug: 143245419 Test: build Change-Id: I5981593697229c1f3314a4a8a4d0c447d7cbe808 --- libwvdrmengine/mediacrypto/Android.mk | 2 ++ libwvdrmengine/mediacrypto/test/Android.mk | 3 +++ libwvdrmengine/mediadrm/Android.mk | 2 ++ libwvdrmengine/mediadrm/test/Android.mk | 2 ++ libwvdrmengine/test/unit/Android.mk | 1 + 5 files changed, 10 insertions(+) diff --git a/libwvdrmengine/mediacrypto/Android.mk b/libwvdrmengine/mediacrypto/Android.mk index a3ac23ee..af10f4b1 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_headers \ libstagefright_foundation_headers \ libutils_headers @@ -59,6 +60,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libutils_headers LOCAL_STATIC_LIBRARIES := \ diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk index 34791043..fc143ea5 100644 --- a/libwvdrmengine/mediacrypto/test/Android.mk +++ b/libwvdrmengine/mediacrypto/test/Android.mk @@ -106,6 +106,9 @@ LOCAL_SHARED_LIBRARIES := \ libprotobuf-cpp-lite \ libutils \ +LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ + LOCAL_C_INCLUDES += \ external/protobuf/src \ diff --git a/libwvdrmengine/mediadrm/Android.mk b/libwvdrmengine/mediadrm/Android.mk index a2740f26..85c1590a 100644 --- a/libwvdrmengine/mediadrm/Android.mk +++ b/libwvdrmengine/mediadrm/Android.mk @@ -21,6 +21,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libstagefright_foundation_headers \ libutils_headers \ @@ -61,6 +62,7 @@ LOCAL_C_INCLUDES := \ vendor/widevine/libwvdrmengine/oemcrypto/include \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libstagefright_foundation_headers \ libutils_headers \ diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk index 907231c2..4e9abf81 100644 --- a/libwvdrmengine/mediadrm/test/Android.mk +++ b/libwvdrmengine/mediadrm/test/Android.mk @@ -39,6 +39,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libstagefright_foundation_headers \ LOCAL_C_INCLUDES += \ @@ -109,6 +110,7 @@ LOCAL_SHARED_LIBRARIES := \ libutils \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libstagefright_foundation_headers \ LOCAL_C_INCLUDES += \ diff --git a/libwvdrmengine/test/unit/Android.mk b/libwvdrmengine/test/unit/Android.mk index b3b94ffb..0b8cade2 100644 --- a/libwvdrmengine/test/unit/Android.mk +++ b/libwvdrmengine/test/unit/Android.mk @@ -29,6 +29,7 @@ LOCAL_SHARED_LIBRARIES := \ libwvdrmengine \ LOCAL_HEADER_LIBRARIES := \ + libstagefright_headers \ libstagefright_foundation_headers \ LOCAL_MODULE := libwvdrmengine_test