commit 90982f280089e6956e82a66bdea79b23373092fb
author Treehugger Robot <treehugger-gerrit@google.com> Tue Aug 06 01:20:29 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 06 01:20:29 2019 +0000
tree 5aa132e0ac90b0a1ae1b4e72388c80849d20ea38
parent 595bb9f78e540c35c774f026d3540847b094d798
parent dc63d2b2b7e44f649a1fc63a0c82204d462fc783

Merge "SoftVorbisDec: Fix isConfigured() in vorbis decoder plugin"

media/audioserver/Android.mk

diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 7b60ff2..3b61370 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -35,7 +35,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"],
 }