Merge pull request #2573 from joliver82/android-16kb-fix

Android 16kb fix

Author: nickidebruyn

.github/workflows/main.yml

@@ -99,7 +99,7 @@ jobs:
     name: Build natives for android
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/cirruslabs/android-sdk:35-ndk
+      image: ghcr.io/cirruslabs/android-sdk:36-ndk
 
     steps:
       - name: Clone the repo

jme3-android-native/src/native/jme_bufferallocator/Android.mk

@@ -39,7 +39,6 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
 LOCAL_LDLIBS     := -llog -Wl,-s
 
 LOCAL_MODULE := bufferallocatorjme

jme3-android-native/src/native/jme_bufferallocator/Application.mk

@@ -37,3 +37,5 @@ APP_PLATFORM := android-19
 # change this to 'debug' to see android logs
 APP_OPTIM := release
 APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
+

jme3-android-native/src/native/jme_decode/Android.mk

@@ -10,7 +10,7 @@ LOCAL_C_INCLUDES:= \
 		$(LOCAL_PATH) \
 		$(LOCAL_PATH)/Tremor
 
-LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz -O0 -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
+LOCAL_CFLAGS := -std=gnu99 -DLIMIT_TO_64kHz -O0
 LOCAL_LDLIBS := -lz -llog -Wl,-s
 
 ifeq ($(TARGET_ARCH),arm)

jme3-android-native/src/native/jme_decode/Application.mk

@@ -1,3 +1,5 @@
 APP_PLATFORM := android-9
 APP_OPTIM := release
 APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true
+

jme3-android-native/src/native/jme_openalsoft/Android.mk

@@ -38,10 +38,15 @@ LOCAL_CFLAGS                := -ffast-math \
                                -DAL_ALEXT_PROTOTYPES \
                                -fcommon \
                                -O0 \
-                               -DRESTRICT="" \
-                               -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=true
+                               -DRESTRICT=""
 
 LOCAL_LDLIBS                := -lOpenSLES -llog -Wl,-s -lc++_static -lc++abi
+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
+    LOCAL_LDFLAGS               += "-Wl,-z,max-page-size=16384"
+endif
+ifeq ($(TARGET_ARCH_ABI),x86_64)
+    LOCAL_LDFLAGS               += "-Wl,-z,max-page-size=16384"
+endif
 LOCAL_STATIC_LIBRARIES      := openalsoft_prebuilt
 # (or LOCAL_WHOLE_STATIC_LIBRARIES if you need every object pulled in)
 

jme3-android-native/src/native/jme_openalsoft/Application.mk

@@ -2,4 +2,5 @@ APP_PLATFORM := android-19
 APP_OPTIM := release
 APP_ABI := armeabi-v7a,arm64-v8a,x86,x86_64
 APP_STL := c++_static
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true