commit 89d816939fcf3a8769e56c8b9a4e61ac7b92fa68
author dimitry <dimitry@google.com> Wed Jul 24 00:15:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jul 24 00:15:17 2019 -0700
tree 895a11f1efa6ab2b995b18dc829f3066485f2669
parent 10879d96fc2204041e300e15474efa1469f2ce20
parent 16634a9f51ba22f7d8099c3e8160eaffa9adff9d

Merge "Apply version-script to libaaudio library." am: 2255c50a92 am: 49742b2ab1 am: 57b5bd3f10
am: 16634a9f51

Change-Id: Ie77e993f5a87336b13bcbd274e79371ee3a49bbe

media/libaaudio/Android.bp

diff --git a/media/libaaudio/Android.bp b/media/libaaudio/Android.bp
index 16958f9..140052f 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,6 +32,5 @@
 cc_library_headers {
     name: "libaaudio_headers",
     export_include_dirs: ["include"],
-    version_script: "libaaudio.map.txt",
 }
 

media/libaaudio/src/Android.bp

diff --git a/media/libaaudio/src/Android.bp b/media/libaaudio/src/Android.bp
index 86cdb9a..56c0170 100644
--- a/media/libaaudio/src/Android.bp
+++ b/media/libaaudio/src/Android.bp
@@ -12,6 +12,7 @@
     ],
     header_libs: ["libaaudio_headers"],
     export_header_lib_headers: ["libaaudio_headers"],
+    version_script: "libaaudio.map.txt",
 
     srcs: [
         "core/AAudioAudio.cpp",

media/libaaudio/src/libaaudio.map.txt

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