From 36dea383df1d08a22b07a9c1348c9824d2099a85 Mon Sep 17 00:00:00 2001
From: Andrew Hsieh <andrewhsieh@google.com>
Date: Thu, 17 Jul 2014 16:32:05 +0800
Subject: [PATCH] Fix gl3stub.h

Only define the following before android-L (where new headers define
them already)

  typedef khronos_int64_t  GLint64;
  typedef khronos_uint64_t GLuint64;
  typedef struct __GLsync *GLsync;

Also define L to 9999 for crtbrand.c which needs it to be an integer

Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
---
 ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h | 3 +++
 ndk/platforms/common/src/crtbrand.c                     | 2 ++
 ndk/sources/android/ndk_helper/gl3stub.h                | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h b/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h
index 7a02bf272..5a7b719ef 100644
--- a/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h
+++ b/ndk/platforms/android-18/samples/gles3jni/jni/gl3stub.h
@@ -14,6 +14,7 @@
  */
 
 #include <GLES2/gl2.h>
+#include <android/api-level.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -54,9 +55,11 @@ GLboolean gl3stubInit();
 /* OpenGL ES 3.0 */
 
 typedef unsigned short   GLhalf;
+#if __ANDROID_API__ <= 19
 typedef khronos_int64_t  GLint64;
 typedef khronos_uint64_t GLuint64;
 typedef struct __GLsync *GLsync;
+#endif
 
 /*-------------------------------------------------------------------------
  * Token definitions
diff --git a/ndk/platforms/common/src/crtbrand.c b/ndk/platforms/common/src/crtbrand.c
index e0fa6f09d..f6c276341 100644
--- a/ndk/platforms/common/src/crtbrand.c
+++ b/ndk/platforms/common/src/crtbrand.c
@@ -37,6 +37,8 @@ typedef int int32_t[sizeof(int) == 4];
 #define ABI_NOTETYPE	1
 #define ABI_ANDROID_API	PLATFORM_SDK_VERSION
 
+#define L 9999
+
 /*
  * Special ".note" entry to tag an Android binary and specify the ABI version.
  *
diff --git a/ndk/sources/android/ndk_helper/gl3stub.h b/ndk/sources/android/ndk_helper/gl3stub.h
index 537dd28b5..c8960dfd6 100644
--- a/ndk/sources/android/ndk_helper/gl3stub.h
+++ b/ndk/sources/android/ndk_helper/gl3stub.h
@@ -14,6 +14,7 @@
  */
 
 #include <GLES2/gl2.h>
+#include <android/api-level.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -64,9 +65,11 @@ GLboolean gl3stubInit();
 /* OpenGL ES 3.0 */
 
 typedef unsigned short GLhalf;
+#if __ANDROID_API__ <= 19
 typedef khronos_int64_t GLint64;
 typedef khronos_uint64_t GLuint64;
 typedef struct __GLsync *GLsync;
+#endif
 
 /*-------------------------------------------------------------------------
  * Token definitions