From 4e5e17eb0a9ff387996c41d162cdcbf4f2365676 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@impossible.com>
Date: Thu, 18 Jan 2018 21:21:15 +0000
Subject: [PATCH] Check __ANDROID__ define when guarding Android code

Both gcc and clang define __ANDROID__ but not ANDROID when targeting Android so
at least with the Meson build, and an NDK r16 toolchain, testing on
Android failed without this change.
---
 src/dispatch_common.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dispatch_common.c b/src/dispatch_common.c
index 718ae07..c973572 100644
--- a/src/dispatch_common.c
+++ b/src/dispatch_common.c
@@ -175,14 +175,14 @@
 
 #ifdef __APPLE__
 #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
-#elif defined(ANDROID)
+#elif defined(__ANDROID__)
 #define GLX_LIB "libGLESv2.so"
 #else
 #define GLVND_GLX_LIB "libGLX.so.1"
 #define GLX_LIB "libGL.so.1"
 #endif
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 #define EGL_LIB "libEGL.so"
 #define GLES1_LIB "libGLESv1_CM.so"
 #define GLES2_LIB "libGLESv2.so"
@@ -718,7 +718,7 @@ epoxy_get_core_proc_address(const char *name, int core_version)
 {
 #ifdef _WIN32
     int core_symbol_support = 11;
-#elif defined(ANDROID)
+#elif defined(__ANDROID__)
     /**
      * All symbols must be resolved through eglGetProcAddress
      * on Android