From 2c8776805a3ef7ff254515f4c51a233ffd509f3d Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Mon, 13 Jan 2014 12:58:46 +0800
Subject: [PATCH] Fix headers to be inclued alone

See b.android.com/64679 for one of header sys/prctl.h

Change-Id: Ie415ebe2086d2f0190d84fba0c57cc7e1e5822ae
---
 ndk/platforms/android-13/include/android/tts.h             | 4 +++-
 ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h | 2 ++
 ndk/platforms/android-14/include/SLES/OpenSLES_Android.h   | 2 ++
 ndk/platforms/android-3/include/sys/prctl.h                | 1 +
 ndk/platforms/android-3/include/sys/utime.h                | 1 +
 ndk/platforms/android-4/include/GLES/glext.h               | 2 ++
 ndk/platforms/android-5/include/GLES2/gl2ext.h             | 2 ++
 ndk/platforms/android-8/include/fts.h                      | 2 ++
 ndk/platforms/android-9/include/EGL/eglext.h               | 2 +-
 ndk/platforms/android-9/include/SLES/OpenSLES_Android.h    | 2 ++
 10 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ndk/platforms/android-13/include/android/tts.h b/ndk/platforms/android-13/include/android/tts.h
index fb15108e0..946498e89 100644
--- a/ndk/platforms/android-13/include/android/tts.h
+++ b/ndk/platforms/android-13/include/android/tts.h
@@ -28,6 +28,8 @@
 extern "C" {
 #endif
 
+#include <stdint.h>
+
 #define ANDROID_TTS_ENGINE_PROPERTY_CONFIG "engineConfig"
 #define ANDROID_TTS_ENGINE_PROPERTY_PITCH  "pitch"
 #define ANDROID_TTS_ENGINE_PROPERTY_RATE   "rate"
@@ -90,7 +92,7 @@ extern android_tts_engine_t *android_getTtsEngine();
 /* Including the old version for legacy support (Froyo compatibility).
  * This should return the same thing as android_getTtsEngine.
  */
-extern "C" android_tts_engine_t *getTtsEngine();
+android_tts_engine_t *getTtsEngine();
 
 // A callback type used to notify the framework of new synthetized
 // audio samples, status will be SYNTH_DONE for the last sample of
diff --git a/ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h b/ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h
index 10f36f4c3..7c9bba5eb 100644
--- a/ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h
+++ b/ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h
@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include "OpenMAXAL.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/
diff --git a/ndk/platforms/android-14/include/SLES/OpenSLES_Android.h b/ndk/platforms/android-14/include/SLES/OpenSLES_Android.h
index f295518e9..4d8f656dd 100644
--- a/ndk/platforms/android-14/include/SLES/OpenSLES_Android.h
+++ b/ndk/platforms/android-14/include/SLES/OpenSLES_Android.h
@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include "OpenSLES.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/
diff --git a/ndk/platforms/android-3/include/sys/prctl.h b/ndk/platforms/android-3/include/sys/prctl.h
index 359d684f3..00e583742 100644
--- a/ndk/platforms/android-3/include/sys/prctl.h
+++ b/ndk/platforms/android-3/include/sys/prctl.h
@@ -29,6 +29,7 @@
 #define _SYS_PRCTL_H
 
 #include <linux/prctl.h>
+#include <sys/cdefs.h>
 
 __BEGIN_DECLS
 
diff --git a/ndk/platforms/android-3/include/sys/utime.h b/ndk/platforms/android-3/include/sys/utime.h
index 9f8810e2e..918d153bb 100644
--- a/ndk/platforms/android-3/include/sys/utime.h
+++ b/ndk/platforms/android-3/include/sys/utime.h
@@ -28,6 +28,7 @@
 #ifndef _SYS_UTIME_H_
 #define _SYS_UTIME_H_
 
+#include <sys/types.h>
 #include <linux/utime.h>
 
 #endif /* _SYS_UTIME_H_ */
diff --git a/ndk/platforms/android-4/include/GLES/glext.h b/ndk/platforms/android-4/include/GLES/glext.h
index 65ab5e40b..015165f7f 100644
--- a/ndk/platforms/android-4/include/GLES/glext.h
+++ b/ndk/platforms/android-4/include/GLES/glext.h
@@ -3,6 +3,8 @@
 
 /* $Revision: 10965 $ on $Date:: 2010-04-09 02:11:29 -0700 #$ */
 
+#include <GLES/gl.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ndk/platforms/android-5/include/GLES2/gl2ext.h b/ndk/platforms/android-5/include/GLES2/gl2ext.h
index 9db4e252c..793e0c209 100644
--- a/ndk/platforms/android-5/include/GLES2/gl2ext.h
+++ b/ndk/platforms/android-5/include/GLES2/gl2ext.h
@@ -3,6 +3,8 @@
 
 /* $Revision: 10969 $ on $Date:: 2010-04-09 02:27:15 -0700 #$ */
 
+#include <GLES2/gl2.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/ndk/platforms/android-8/include/fts.h b/ndk/platforms/android-8/include/fts.h
index da26a8823..d18fc2cc7 100644
--- a/ndk/platforms/android-8/include/fts.h
+++ b/ndk/platforms/android-8/include/fts.h
@@ -35,6 +35,8 @@
 #ifndef	_FTS_H_
 #define	_FTS_H_
 
+#include <sys/types.h>
+
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
 	struct _ftsent *fts_child;	/* linked list of children */
diff --git a/ndk/platforms/android-9/include/EGL/eglext.h b/ndk/platforms/android-9/include/EGL/eglext.h
index a08932a3d..7b6ed1b3b 100644
--- a/ndk/platforms/android-9/include/EGL/eglext.h
+++ b/ndk/platforms/android-9/include/EGL/eglext.h
@@ -28,7 +28,7 @@ extern "C" {
 ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
 */
 
-#include <EGL/eglplatform.h>
+#include <EGL/egl.h>
 
 /*************************************************************/
 
diff --git a/ndk/platforms/android-9/include/SLES/OpenSLES_Android.h b/ndk/platforms/android-9/include/SLES/OpenSLES_Android.h
index 829df68cd..01568d295 100644
--- a/ndk/platforms/android-9/include/SLES/OpenSLES_Android.h
+++ b/ndk/platforms/android-9/include/SLES/OpenSLES_Android.h
@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include "OpenSLES.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/