From c0e86862977deee0ba2dc9e3ff6a027b04c6ba28 Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@curious-creature.com>
Date: Tue, 30 Nov 2021 11:14:35 -0800
Subject: [PATCH] Use __ANDROID__ instead of ANDROID

---
 android/build.gradle                              | 1 -
 android/common/CallbackUtils.cpp                  | 6 +++---
 android/common/CallbackUtils.h                    | 2 +-
 android/filament-android/src/main/cpp/Stream.cpp  | 4 ++--
 android/filament-android/src/main/cpp/Texture.cpp | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index edb29cb22b..cade773614 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -101,7 +101,6 @@ buildscript {
     ]
 
     ext.cppFlags = [
-        "-DANDROID", // Note: this should not be required! Seems like a bug in NDK 23
         "-std=c++17",
         "-Wno-unused-command-line-argument",
         "-Wl,--hash-style=both", // Required to support API levels below 23
diff --git a/android/common/CallbackUtils.cpp b/android/common/CallbackUtils.cpp
index d9a5151990..d1a615752c 100644
--- a/android/common/CallbackUtils.cpp
+++ b/android/common/CallbackUtils.cpp
@@ -19,7 +19,7 @@
 #include "private/backend/VirtualMachineEnv.h"
 
 void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
-#ifdef ANDROID
+#ifdef __ANDROID__
     callbackUtils.handlerClass = env->FindClass("android/os/Handler");
     callbackUtils.handlerClass = (jclass) env->NewGlobalRef(callbackUtils.handlerClass);
     callbackUtils.post = env->GetMethodID(callbackUtils.handlerClass,
@@ -34,7 +34,7 @@ void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
 
 void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback) {
     if (handler && callback) {
-#ifdef ANDROID
+#ifdef __ANDROID__
         if (env->IsInstanceOf(handler, callbackUtils.handlerClass)) {
             env->CallBooleanMethod(handler, callbackUtils.post, callback);
         }
@@ -45,7 +45,7 @@ void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler,
     }
     env->DeleteGlobalRef(handler);
     env->DeleteGlobalRef(callback);
-#ifdef ANDROID
+#ifdef __ANDROID__
     env->DeleteGlobalRef(callbackUtils.handlerClass);
 #endif
     env->DeleteGlobalRef(callbackUtils.executorClass);
diff --git a/android/common/CallbackUtils.h b/android/common/CallbackUtils.h
index 93e3c7ec0f..aa93f566ec 100644
--- a/android/common/CallbackUtils.h
+++ b/android/common/CallbackUtils.h
@@ -25,7 +25,7 @@
 #include <filament/Engine.h>
 
 struct CallbackJni {
-#ifdef ANDROID
+#ifdef __ANDROID__
     jclass handlerClass = nullptr;
     jmethodID post = nullptr;
 #endif
diff --git a/android/filament-android/src/main/cpp/Stream.cpp b/android/filament-android/src/main/cpp/Stream.cpp
index e84767d676..80469c6d2a 100644
--- a/android/filament-android/src/main/cpp/Stream.cpp
+++ b/android/filament-android/src/main/cpp/Stream.cpp
@@ -24,7 +24,7 @@
 #include "common/NioUtils.h"
 #include "common/CallbackUtils.h"
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
 #if __has_include(<android/hardware_buffer_jni.h>)
 #include <android/hardware_buffer_jni.h>
@@ -190,7 +190,7 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
     Engine* engine = (Engine*) nativeEngine;
     Stream* stream = (Stream*) nativeStream;
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
     // This function is not available before NDK 15 or before Android 8.
     if (UTILS_UNLIKELY(!AHardwareBuffer_fromHardwareBuffer_fn)) {
diff --git a/android/filament-android/src/main/cpp/Texture.cpp b/android/filament-android/src/main/cpp/Texture.cpp
index b4384eef56..a6eb4ed29c 100644
--- a/android/filament-android/src/main/cpp/Texture.cpp
+++ b/android/filament-android/src/main/cpp/Texture.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <functional>
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <android/bitmap.h>
 #endif
 
@@ -471,7 +471,7 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
 // ANDROID SPECIFIC BITS
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#ifdef ANDROID
+#ifdef __ANDROID__
 
 #define BITMAP_CONFIG_ALPHA_8   0
 #define BITMAP_CONFIG_RGB_565   1