Merge "Apply version-script to libaaudio library."

media/libaaudio/Android.bp

@@ -24,7 +24,7 @@ ndk_headers {
 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 @@ ndk_library {
 cc_library_headers {
     name: "libaaudio_headers",
     export_include_dirs: ["include"],
-    version_script: "libaaudio.map.txt",
 }
 
 subdirs = ["*"]

media/libaaudio/src/Android.bp

@@ -11,6 +11,7 @@ cc_library {
     ],
     header_libs: ["libaaudio_headers"],
     export_header_lib_headers: ["libaaudio_headers"],
+    version_script: "libaaudio.map.txt",
 
     srcs: [
         "core/AAudioAudio.cpp",