Merge "Restore stream [dis]connect parameters in deprecated state"
diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
index 573c415..e11af12 100644
--- a/media/audioserver/Android.mk
+++ b/media/audioserver/Android.mk
@@ -40,7 +40,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
diff --git a/media/libmediametrics/Android.bp b/media/libmediametrics/Android.bp
index 50f18f4..9d348ec 100644
--- a/media/libmediametrics/Android.bp
+++ b/media/libmediametrics/Android.bp
@@ -42,6 +42,10 @@
enabled: true,
symbol_file: "libmediametrics.map.txt",
},
+
+ visibility: [
+ "//frameworks/av:__subpackages__",
+ "//frameworks/base/core/jni",
+ "//frameworks/base/media/jni",
+ ],
}
-
-
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"],
}