commit 6ab3c15c95321e8f8ae00c1446dac5979f0067ef
author Mikhail Naganov <mnaganov@google.com> Mon Aug 05 11:21:08 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Aug 05 11:21:08 2019 -0700
tree 654c4bf06a71f54de35f6e493d56d3d3833a0f42
parent 20ce5600fdd860cfd271b4f136fd4fb3a3b936a2
parent 63923498b78454964e734fbc6bc187045c2b09e8

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

Change-Id: I08d6a52930c90d3d6eb3605f4ef1d835de636b54

media/audioserver/Android.mk

diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 969f2ee..4a34715 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -39,7 +39,6 @@
 	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

diff --git a/media/libnbaio/Android.bp b/media/libnbaio/Android.bp
index a4df38d..6345742 100644
--- a/media/libnbaio/Android.bp
+++ b/media/libnbaio/Android.bp
@@ -1,4 +1,3 @@
-
 cc_defaults {
     name: "libnbaio_mono_defaults",
     srcs: [
@@ -21,6 +20,9 @@
         "liblog",
         "libutils",
     ],
+    export_shared_lib_headers: [
+        "libaudioutils",
+    ],
 
     export_include_dirs: ["include_mono"],
 }
@@ -66,7 +68,5 @@
         "-Wall",
     ],
 
-    include_dirs: ["system/media/audio_utils/include"],
-
     export_include_dirs: ["include"],
 }