am b14ac43d: am ca34e29d: Merge "Fix headers to be inclued alone"

* commit 'b14ac43dbd37c9519b339a99468b1d4a38ec2ce4':
  Fix headers to be inclued alone

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

ndk/platforms/android-14/include/OMXAL/OpenMAXAL_Android.h

@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include "OpenMAXAL.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/

ndk/platforms/android-14/include/SLES/OpenSLES_Android.h

@@ -24,6 +24,8 @@
 extern "C" {
 #endif
 
+#include "OpenSLES.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/

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
 

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_ */

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

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

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 */

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>
 
 /*************************************************************/
 

ndk/platforms/android-9/include/SLES/OpenSLES_Android.h

@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#include "OpenSLES.h"
+
 /*---------------------------------------------------------------------------*/
 /* Android common types                                                      */
 /*---------------------------------------------------------------------------*/