commit 8526dc573cc1e92aaf47ffeac76ec930fb390ab3
author Dimitry Ivanov <dimitry@google.com> Fri Nov 30 04:31:51 2018 -0800
committer android-build-merger <android-build-merger@google.com> Fri Nov 30 04:31:51 2018 -0800
tree 29ed934c72b945ea0032876fb123c11f69057f2c
parent e7c399b8153f3aede039bf68e8467c2041f1c7d7
parent 7aa5e8a2d0677025d093fedc64f48d49bf22f29d

Merge "Apply version-script to libOpenSLES/MAXAL libraries" am: 221fe916fe
am: 7aa5e8a2d0

Change-Id: I85ed2ef79ba90835e45946fa5b89b0c0791b2da5

Android.bp

diff --git a/Android.bp b/Android.bp
index f8f354d..a0baea7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -22,7 +22,7 @@
 
 ndk_library {
     name: "libOpenMAXAL",
-    symbol_file: "libOpenMAXAL.map.txt",
+    symbol_file: "src/libOpenMAXAL.map.txt",
     first_version: "14",
     unversioned_until: "current",
 }
@@ -37,7 +37,7 @@
 
 ndk_library {
     name: "libOpenSLES",
-    symbol_file: "libOpenSLES.map.txt",
+    symbol_file: "src/libOpenSLES.map.txt",
     first_version: "9",
     unversioned_until: "current",
 }

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index 3f2a04f..7a9187b 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -264,6 +264,7 @@
         "liblog",
         "libnativewindow",
     ],
+    version_script: "libOpenSLES.map.txt",
 }
 
 cc_library_shared {
@@ -293,4 +294,5 @@
         "liblog",
         "libnativewindow",
     ],
+    version_script: "libOpenMAXAL.map.txt",
 }

src/libOpenMAXAL.map.txt

diff --git a/libOpenMAXAL.map.txt b/src/libOpenMAXAL.map.txt
similarity index 100%
rename from libOpenMAXAL.map.txt
rename to src/libOpenMAXAL.map.txt

src/libOpenSLES.map.txt

diff --git a/libOpenSLES.map.txt b/src/libOpenSLES.map.txt
similarity index 90%
rename from libOpenSLES.map.txt
rename to src/libOpenSLES.map.txt
index 62ecf71..b70228f 100644
--- a/libOpenSLES.map.txt
+++ b/src/libOpenSLES.map.txt
@@ -6,12 +6,15 @@
     SL_IID_3DLOCATION; # var
     SL_IID_3DMACROSCOPIC; # var
     SL_IID_3DSOURCE; # var
+    SL_IID_ANDROIDACOUSTICECHOCANCELLATION; # var introduced=21
+    SL_IID_ANDROIDAUTOMATICGAINCONTROL; # var introduced=21
     SL_IID_ANDROIDBUFFERQUEUESOURCE; # var introduced-arm=14 introduced-arm64=21 introduced-mips=14 introduced-mips64=21 introduced-x86=14 introduced-x86_64=21
     SL_IID_ANDROIDCONFIGURATION; # var
     SL_IID_ANDROIDEFFECT; # var
     SL_IID_ANDROIDEFFECTCAPABILITIES; # var
     SL_IID_ANDROIDEFFECTSEND; # var
     SL_IID_ANDROIDSIMPLEBUFFERQUEUE; # var
+    SL_IID_ANDROIDNOISESUPPRESSION; # var introduced=21
     SL_IID_AUDIODECODERCAPABILITIES; # var
     SL_IID_AUDIOENCODER; # var
     SL_IID_AUDIOENCODERCAPABILITIES; # var