Link with actual headers instead of symlinks

Bug: 143245419
Test: build
Change-Id: I5981593697229c1f3314a4a8a4d0c447d7cbe808

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

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 \
 

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 \
 

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 += \

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