commit 0c5757f7ce0396698553c78e2a1b2d12c4adb9a2
author Paul Mclean <pmclean@google.com> Mon Jun 05 21:31:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jun 05 21:31:28 2017 +0000
tree 6a5bf11cbba12b62e51ace70e1a301a7cd37cc52
parent 3a4764463553c26ce76336c5e71fdc81d7c79920
parent cd82f70f91f97b555744ecea494e8e75990e9512

Merge "fix b/62040757 - bad pointer to native audioplayer in 32-bit builds." into oc-dev am: 453b68a9b8
am: cd82f70f91

Change-Id: I39ee98f28d81f3e0f93732a561df3c6b5548f0fe

include/OMXAL/OpenMAXAL_Android.h

diff --git a/include/OMXAL/OpenMAXAL_Android.h b/include/OMXAL/OpenMAXAL_Android.h
index 34b9dd9..0ea22f0 100644
--- a/include/OMXAL/OpenMAXAL_Android.h
+++ b/include/OMXAL/OpenMAXAL_Android.h
@@ -17,6 +17,8 @@
 #ifndef OPENMAX_AL_ANDROID_H_
 #define OPENMAX_AL_ANDROID_H_
 
+#include "OpenMAXAL.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

include/SLES/OpenSLES_Android.h

diff --git a/include/SLES/OpenSLES_Android.h b/include/SLES/OpenSLES_Android.h
index 7122058..e9e2f05 100644
--- a/include/SLES/OpenSLES_Android.h
+++ b/include/SLES/OpenSLES_Android.h
@@ -17,6 +17,7 @@
 #ifndef OPENSL_ES_ANDROID_H_
 #define OPENSL_ES_ANDROID_H_
 
+#include "OpenSLES.h"
 #include "OpenSLES_AndroidConfiguration.h"
 #include "OpenSLES_AndroidMetadata.h"
 #include <jni.h>

src/Android.bp

diff --git a/src/Android.bp b/src/Android.bp
index 8e0f6eb..b420645 100644
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -212,6 +212,7 @@
         "libstagefright",
         "libstagefright_foundation",
         "libcutils",
+        "libnativewindow",
         "libgui",
         "libdl",
         "libandroid_runtime",
@@ -250,6 +251,7 @@
     shared_libs: [
         "libwilhelm",
         "liblog",
+        "libnativewindow",
     ],
 }
 
@@ -278,5 +280,6 @@
     shared_libs: [
         "libwilhelm",
         "liblog",
+        "libnativewindow",
     ],
 }