Link with actual headers instead of symlinks

Bug: 143245419
Test: build
Change-Id: Iff096c2d3568f2db4260a1d2a86d2746ea4824ed
This commit is contained in:
Marco Nelissen
2020-01-07 11:33:57 -08:00
parent 75ecbc4dd2
commit 8af30972b2
5 changed files with 19 additions and 1 deletions

View File

@@ -245,6 +245,9 @@ LOCAL_SHARED_LIBRARIES := \
libprotobuf-cpp-lite \
libutils \
LOCAL_HEADER_LIBRARIES := \
libstagefright_foundation_headers \
LOCAL_MODULE := libwvhidl
LOCAL_MODULE_TAGS := optional

View File

@@ -20,6 +20,7 @@ LOCAL_C_INCLUDES := \
vendor/widevine/libwvdrmengine/oemcrypto/include \
LOCAL_HEADER_LIBRARIES := \
libstagefright_foundation_headers \
libutils_headers
LOCAL_STATIC_LIBRARIES := \

View File

@@ -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 := \

View File

@@ -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 \

View File

@@ -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