Merge "libnbaio: Add libaudioutils headers export" am: 595bb9f78e am: 4512298d08

am: 63923498b7

Change-Id: I08d6a52930c90d3d6eb3605f4ef1d835de636b54

media/audioserver/Android.mk

@@ -39,7 +39,6 @@ LOCAL_C_INCLUDES := \
 	frameworks/av/media/libaaudio/src \
 	frameworks/av/media/libaaudio/src/binding \
 	frameworks/av/media/libmedia \
-	$(call include-path-for, audio-utils) \
 	external/sonic \
 
 # If AUDIOSERVER_MULTILIB in device.mk is non-empty then it is used to control

media/libnbaio/Android.bp

@@ -1,4 +1,3 @@
-
 cc_defaults {
     name: "libnbaio_mono_defaults",
     srcs: [
@@ -21,6 +20,9 @@ cc_defaults {
         "liblog",
         "libutils",
     ],
+    export_shared_lib_headers: [
+        "libaudioutils",
+    ],
 
     export_include_dirs: ["include_mono"],
 }
@@ -66,7 +68,5 @@ cc_library_shared {
         "-Wall",
     ],
 
-    include_dirs: ["system/media/audio_utils/include"],
-
     export_include_dirs: ["include"],
 }