commit de44c0937c5a3c2f45c2346a4a5754e228db473b
author Dan Albert <danalbert@google.com> Thu Oct 06 17:51:40 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 06 17:51:40 2016 +0000
tree ab74ceb39d0ce7ee6e4503e62f6f068be13de7b5
parent c915d4ac735c984549811b144d06db74db9600f2
parent 8255e3a4c1acf6ed878e05e5b7fbc4f78cf674a5

Migrate libOpenSLES to ndk_library. am: 0e094abc59
am: 8255e3a4c1

Change-Id: I46b7848a3d2d42656be0e73db2498c0028032e42

Android.bp

diff --git a/Android.bp b/Android.bp
index f9a37bc..34b8499 100644
--- a/Android.bp
+++ b/Android.bp
@@ -24,3 +24,16 @@
     symbol_file: "libOpenMAXAL.map.txt",
     first_version: "14",
 }
+
+ndk_headers {
+    name: "libOpenSLES_headers",
+    from: "include",
+    to: "",
+    srcs: ["include/SLES/**/*.h"], // All headers in all subdirs.
+}
+
+ndk_library {
+    name: "libOpenSLES.ndk",
+    symbol_file: "libOpenSLES.map.txt",
+    first_version: "9",
+}

libOpenSLES.map.txt

diff --git a/libOpenSLES.map.txt b/libOpenSLES.map.txt
new file mode 100644
index 0000000..62ecf71
--- /dev/null
+++ b/libOpenSLES.map.txt
@@ -0,0 +1,58 @@
+LIBOPENSLES {
+  global:
+    SL_IID_3DCOMMIT; # var
+    SL_IID_3DDOPPLER; # var
+    SL_IID_3DGROUPING; # var
+    SL_IID_3DLOCATION; # var
+    SL_IID_3DMACROSCOPIC; # var
+    SL_IID_3DSOURCE; # var
+    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_AUDIODECODERCAPABILITIES; # var
+    SL_IID_AUDIOENCODER; # var
+    SL_IID_AUDIOENCODERCAPABILITIES; # var
+    SL_IID_AUDIOIODEVICECAPABILITIES; # var
+    SL_IID_BASSBOOST; # var
+    SL_IID_BUFFERQUEUE; # var
+    SL_IID_DEVICEVOLUME; # var
+    SL_IID_DYNAMICINTERFACEMANAGEMENT; # var
+    SL_IID_DYNAMICSOURCE; # var
+    SL_IID_EFFECTSEND; # var
+    SL_IID_ENGINE; # var
+    SL_IID_ENGINECAPABILITIES; # var
+    SL_IID_ENVIRONMENTALREVERB; # var
+    SL_IID_EQUALIZER; # var
+    SL_IID_LED; # var
+    SL_IID_METADATAEXTRACTION; # var
+    SL_IID_METADATATRAVERSAL; # var
+    SL_IID_MIDIMESSAGE; # var
+    SL_IID_MIDIMUTESOLO; # var
+    SL_IID_MIDITEMPO; # var
+    SL_IID_MIDITIME; # var
+    SL_IID_MUTESOLO; # var
+    SL_IID_NULL; # var
+    SL_IID_OBJECT; # var
+    SL_IID_OUTPUTMIX; # var
+    SL_IID_PITCH; # var
+    SL_IID_PLAY; # var
+    SL_IID_PLAYBACKRATE; # var
+    SL_IID_PREFETCHSTATUS; # var
+    SL_IID_PRESETREVERB; # var
+    SL_IID_RATEPITCH; # var
+    SL_IID_RECORD; # var
+    SL_IID_SEEK; # var
+    SL_IID_THREADSYNC; # var
+    SL_IID_VIBRA; # var
+    SL_IID_VIRTUALIZER; # var
+    SL_IID_VISUALIZATION; # var
+    SL_IID_VOLUME; # var
+    slCreateEngine;
+    slQueryNumSupportedEngineInterfaces;
+    slQuerySupportedEngineInterfaces;
+  local:
+    *;
+};