Android x86_64 emulator fixes. NDK to 28.2. SDK to 36 (#543)

* Android x86_64 emulator fixes. NDK to 28.2. SDK to 36

(cherry picked from commit 73830bfdee35d945af5af7161d943b3e4d4c3924)

* Android Target

Author: danoli3

.github/workflows/build-android.yml

@@ -42,8 +42,8 @@ jobs:
     strategy:
       matrix:
         ARCH: [armv7, arm64, x86_64]
-        SDK: ["35.0.0"]
-        NDK: ["28.0.13004108"]
+        SDK: ["36.0.0"]
+        NDK: ["28.2.13676358"]
         API: ["24"]
     env:
       ARCH: ${{ matrix.ARCH }}

apothecary/configure/android_configure.sh

@@ -22,7 +22,7 @@ export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/android"
 
 if [ "${NDK:-}" == "27.2.12479018" ]; then 
     export NDK_ROOT="${ANDROID_NDK_ROOT:-}"
-elif [ "${NDK:-}" == "28.0.13004108" ]; then 
+elif [ "${NDK:-}" == "28.2.13676358" ]; then 
     if [ -n "${ANDROID_NDK_LATEST_HOME:-}" ]; then
         export ANDROID_NDK_ROOT="${ANDROID_NDK_LATEST_HOME}"
     fi

apothecary/toolchains/android.toolchain.cmake

@@ -79,29 +79,29 @@ if(ANDROID_ABI STREQUAL "armeabi-v7a")
     set(CMAKE_ANDROID_ARM_MODE ON)
     set(CMAKE_ANDROID_ARM_NEON ON)
     set(CMAKE_SYSTEM_PROCESSOR "armv7-a")
-    set(CMAKE_C_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
-    set(CMAKE_CXX_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
+    set(CMAKE_C_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
+    set(CMAKE_CXX_FLAGS "-mfpu=neon -mfloat-abi=softfp -O3 -ffast-math -funroll-loops -funsafe-math-optimizations -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
 elseif(ANDROID_ABI STREQUAL "arm64-v8a")
     set(MACHINE "arm64")
     set(ANDROID_PREFIX "aarch64-linux-android")
     set(ANDROID_TARGET "aarch64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
     set(CMAKE_SYSTEM_PROCESSOR "aarch64")
-    set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
-    set(CMAKE_CXX_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET}")
+    set(CMAKE_C_FLAGS "-O3 -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
+    set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti -ffast-math -funroll-loops -funsafe-math-optimizations --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
 elseif(ANDROID_ABI STREQUAL "x86")
     set(MACHINE "i686")
     set(ANDROID_PREFIX "i686-linux-android")
     set(ANDROID_TARGET "i686-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
     set(CMAKE_SYSTEM_PROCESSOR "i686")
-    set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
-    set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops")
+    set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
+    set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
 elseif(ANDROID_ABI STREQUAL "x86_64")
     set(MACHINE "x86_64")
     set(ANDROID_PREFIX "x86_64-linux-android")
     set(ANDROID_TARGET "x86_64-none-linux-android${ANDROID_NATIVE_API_LEVEL}")
     set(CMAKE_SYSTEM_PROCESSOR "x86_64")
-    set(CMAKE_C_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
-    set(CMAKE_CXX_FLAGS "-msse4.2 -mavx -O3 -ffast-math -funroll-loops --target=${ANDROID_TARGET}")
+    set(CMAKE_C_FLAGS "-O3 --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
+    set(CMAKE_CXX_FLAGS "-O3 -fexceptions -frtti --target=${ANDROID_TARGET} -D__ANDROID_API__=${ANDROID_API}")
 else()
     message(FATAL_ERROR "Unsupported ANDROID_ABI: ${ANDROID_ABI}")
 endif()