Merge "Link with actual headers instead of symlinks"

drm/libmediadrm/Android.bp

@@ -165,4 +165,8 @@ cc_library_shared {
         "libmediadrmmetrics_full",
         "libutils",
     ],
+
+    header_libs: [
+        "libstagefright_foundation_headers",
+    ],
 }

include/media/audiohal

@@ -1 +0,0 @@
-../../media/libaudiohal/include/media/audiohal/

include/media/nbaio/AudioStreamOutSink.h

@@ -1 +0,0 @@
-../../../media/libnbaio/include/media/nbaio/AudioStreamOutSink.h

include/media/nbaio/NBAIO.h

@@ -1 +0,0 @@
-../../../media/libnbaio/include_mono/media/nbaio/NBAIO.h

include/media/nbaio/SingleStateQueue.h

@@ -1 +0,0 @@
-../../../media/libnbaio/include_mono/media/nbaio/SingleStateQueue.h

include/media/stagefright

@@ -1 +0,0 @@
-../../media/libstagefright/include/media/stagefright/

media/audioserver/Android.mk

@@ -22,6 +22,9 @@ LOCAL_SHARED_LIBRARIES := \
 	libutils \
 	libvibrator
 
+LOCAL_HEADER_LIBRARIES := \
+	libaudiohal_headers \
+
 # TODO oboeservice is the old folder name for aaudioservice. It will be changed.
 LOCAL_C_INCLUDES := \
 	frameworks/av/services/audioflinger \

media/libaudioclient/Android.bp

@@ -90,7 +90,12 @@ cc_library_shared {
     ],
     export_shared_lib_headers: ["libbinder"],
 
-    local_include_dirs: ["include/media", "aidl"],
+    include_dirs: [
+        "frameworks/av/media/libnbaio/include_mono/",
+    ],
+    local_include_dirs: [
+        "include/media", "aidl"
+    ],
     header_libs: [
         "libaudioclient_headers",
         "libbase_headers",

media/libaudioprocessing/Android.bp

@@ -32,6 +32,7 @@ cc_library_shared {
     ],
 
     header_libs: [
+        "libaudiohal_headers",
         "libbase_headers",
         "libmedia_headers"
     ],

media/libstagefright/colorconversion/Android.bp

@@ -15,6 +15,11 @@ cc_library_static {
         "libnativewindow",
     ],
 
+    header_libs: [
+        "libstagefright_headers",
+        "libstagefright_foundation_headers",
+    ],
+
     static_libs: ["libyuv_static"],
 
     cflags: ["-Werror"],

media/libstagefright/foundation/Android.bp

@@ -2,6 +2,7 @@ cc_library_headers {
     name: "libstagefright_foundation_headers",
     export_include_dirs: ["include"],
     vendor_available: true,
+    host_supported: true,
 }
 
 cc_defaults {

media/libstagefright/include/media/stagefright/AACWriter.h

@@ -17,7 +17,7 @@
 #ifndef AAC_WRITER_H_
 #define AAC_WRITER_H_
 
-#include "foundation/ABase.h"
+#include "media/stagefright/foundation/ABase.h"
 #include <media/stagefright/MediaWriter.h>
 #include <utils/threads.h>
 

media/libstagefright/include/media/stagefright/MediaMuxer.h

@@ -22,7 +22,7 @@
 #include <utils/Vector.h>
 #include <utils/threads.h>
 
-#include "foundation/ABase.h"
+#include "media/stagefright/foundation/ABase.h"
 
 namespace android {
 

media/libstagefright/include/media/stagefright/foundation

@@ -1 +0,0 @@
-../../../foundation/include/media/stagefright/foundation/

media/ndk/Android.bp

@@ -179,6 +179,10 @@ cc_test {
         "libcutils",
         "android.hardware.graphics.bufferqueue@1.0",
     ],
+    header_libs: [
+        "libstagefright_foundation_headers",
+    ],
+
     cflags: [
         "-D__ANDROID_VNDK__",
     ],

services/audioflinger/Android.bp

@@ -63,6 +63,7 @@ cc_library_shared {
     ],
 
     header_libs: [
+        "libaudiohal_headers",
         "libmedia_headers",
     ],
 

services/oboeservice/Android.bp

@@ -55,4 +55,12 @@ cc_library_shared {
         "libutils",
     ],
 
+    header_libs: [
+        "libaudiohal_headers",
+    ],
+
+    include_dirs: [
+        "frameworks/av/media/libnbaio/include_mono",
+        "frameworks/av/media/libnbaio/include",
+    ],
 }