Apply version-script to libaaudio library.
In previous attempt it was mistakenly applied to cc_library_header
instead of the actual library. Do it correctly this time.
The intention of this change is to hide unintentionally
exported symbols from the library.
Bug: http://b/69603741
Test: make
Change-Id: I47967abea0b39aec05e80823c9eb3fe53f9fa591
diff --git a/media/libaaudio/Android.bp b/media/libaaudio/Android.bp
index 4857008..c967331 100644
--- a/media/libaaudio/Android.bp
+++ b/media/libaaudio/Android.bp
@@ -24,7 +24,7 @@
ndk_library {
name: "libaaudio",
// deliberately includes symbols from AAudioTesting.h
- symbol_file: "libaaudio.map.txt",
+ symbol_file: "src/libaaudio.map.txt",
first_version: "26",
unversioned_until: "current",
}
@@ -32,7 +32,6 @@
cc_library_headers {
name: "libaaudio_headers",
export_include_dirs: ["include"],
- version_script: "libaaudio.map.txt",
}
subdirs = ["*"]
diff --git a/media/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp
index c875436..848e42a 100644
--- a/media/libaaudio/src/Android.bp
+++ b/media/libaaudio/src/Android.bp
@@ -11,6 +11,7 @@
],
header_libs: ["libaaudio_headers"],
export_header_lib_headers: ["libaaudio_headers"],
+ version_script: "libaaudio.map.txt",
srcs: [
"core/AAudioAudio.cpp",
diff --git a/media/libaaudio/libaaudio.map.txt b/media/libaaudio/src/libaaudio.map.txt
similarity index 100%
rename from media/libaaudio/libaaudio.map.txt
rename to media/libaaudio/src/libaaudio.map.txt