Merge pull request #224 from Ghabry/android

Android: Update to NDK 28 which has a default alignment of 16k (Required since Nov 2025) and drop SDL2

Author: carstene1ns

LICENSE

@@ -15,12 +15,12 @@ lhasa: ISC
 mpg123: LGPLv2.1+
 nlohmann-json: MIT
 ogg: BSD
-opus: BSD    
-opusfile: BSD   
+opus: BSD
+opusfile: BSD
 pixman: MIT
 png: zlib
 samplerate: BSD
-SDL2: zlib
+SDL3: zlib
 sndfile: LGPLv2.1+
 speexdsp: BSD
 vorbis: BSD

android/1_download_library.sh

@@ -38,7 +38,7 @@ else
 	exit 1
 fi
 
-SDK_VERSION="9477386_latest"
+SDK_VERSION="14742923_latest"
 SDK_URL="https://dl.google.com/android/repository/commandlinetools-${SDK_PLATFORM}-${SDK_VERSION}.zip"
 curl -sSLOR "$SDK_URL"
 unzip commandlinetools-${SDK_PLATFORM}-${SDK_VERSION}.zip
@@ -68,7 +68,7 @@ echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "cmake;3.22.1"
 
 msg " [3] Installing Android NDK"
 
-echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "ndk;21.4.7075529"
+echo "y" | ./cmdline-tools/latest/bin/sdkmanager --verbose "ndk;28.2.13676358"
 
 cd ..
 
@@ -162,14 +162,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
-# SDL3
-rm -rf $SDL3_DIR
-download_and_extract $SDL3_URL
-
 # liblcf
 rm -rf liblcf
 download_liblcf

android/2_build_toolchain.sh

@@ -31,30 +31,9 @@ if [ ! -f .patches-applied ]; then
 		patch -Np1 < ../pixman-cpufeatures.patch
 	)
 
-	# use android config
-	(cd $SDL2_DIR
-		mv include/SDL_config_android.h include/SDL_config.h
-		mkdir -p jni
-	)
-
 	touch .patches-applied
 fi
 
-# Install SDL2
-# FIXME: Remove this when SDL3 migration is done
-function install_lib_sdl {
-	# $1: platform (armeabi-v7a aarch64 x86 x86_x64)
-
-	pushd $SDL2_DIR
-	echo "APP_ABI := $1" >> "jni/Application.mk"
-	ndk-build NDK_PROJECT_PATH=. NDK_DEBUG=0 APP_BUILD_SCRIPT=./Android.mk APP_PLATFORM=android-$TARGET_API
-	mkdir -p $PLATFORM_PREFIX/lib
-	mkdir -p $PLATFORM_PREFIX/include/SDL2
-	cp libs/$1/* $PLATFORM_PREFIX/lib/
-	cp include/* $PLATFORM_PREFIX/include/SDL2/
-	cd ..
-}
-
 function build() {
 	# $1: Toolchain Name
 	# $2: Toolchain architecture
@@ -66,15 +45,7 @@ function build() {
 
 	echo "Preparing $1 toolchain"
 
-	export TARGET_API=16
-	if [ "$3" = "arm64" ]; then
-		# Minimum API 21 on ARM64
-		export TARGET_API=21
-	fi
-	if [ "$3" = "x86_64" ]; then
-		# Minimum API 21 on x86_64
-		export TARGET_API=21
-	fi
+	export TARGET_API=21
 
 	export PATH=$OLD_PATH
 	export PLATFORM_PREFIX=$WORKSPACE/$2-toolchain
@@ -85,7 +56,7 @@ function build() {
 	export NM=$NDK_PATH/llvm-nm
 	export RANLIB=$NDK_PATH/llvm-ranlib
 
-	export CFLAGS="-no-integrated-as -g0 -O2 -fPIC $5"
+	export CFLAGS="-g0 -O2 -fPIC $5"
 	export CXXFLAGS="$CFLAGS"
 	export CPPFLAGS="-I$PLATFORM_PREFIX/include -I$ANDROID_NDK/sources/android/cpufeatures"
 	export LDFLAGS="-L$PLATFORM_PREFIX/lib"
@@ -122,12 +93,11 @@ function build() {
 	install_lib $LHASA_DIR $LHASA_ARGS
 	install_lib_cmake $FMT_DIR $FMT_ARGS
 	install_lib_icu_cross
-	install_lib_sdl "$2"
 	install_lib_liblcf
 }
 
 export SDK_ROOT=$WORKSPACE/android-sdk
-export ANDROID_NDK=$SDK_ROOT/ndk/21.4.7075529
+export ANDROID_NDK=$SDK_ROOT/ndk/28.2.13676358
 
 export MAKEFLAGS="-j${nproc:-2}"
 

emscripten/1_download_library.sh

@@ -142,10 +142,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL

emscripten/2_build_toolchain.sh

@@ -121,14 +121,6 @@ install_lib_cmake $NLOHMANNJSON_DIR $NLOHMANNJSON_ARGS
 install_lib_meson $INIH_DIR $INIH_ARGS
 #install_lib $LHASA_DIR $LHASA_ARGS
 install_lib_cmake $FMT_DIR $FMT_ARGS
-
-# emscripten TARGET_HOST does not work for all libraries but SDL2 requires it
-export TARGET_HOST="asmjs-unknown-emscripten"
-rm -f config.cache
-install_lib $SDL2_DIR $SDL2_ARGS --disable-assembly --disable-threads --disable-cpuinfo
-rm -f config.cache
-unset TARGET_HOST
-
 install_lib_cmake $SDL3_DIR $SDL3_ARGS
 
 install_lib_icu_cross

emscripten/3_cleanup.sh

@@ -7,6 +7,4 @@ headermsg "Cleaning up library build folders and other stuff..."
 
 cleanup
 
-rm -rf SDL2/
-
 echo " -> done"

ios/1_download_library.sh

@@ -100,10 +100,6 @@ download_and_extract $ICUDATA_URL
 
 msg " [3] Downloading platform libraries"
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL

ios/2_build_toolchain.sh

@@ -89,7 +89,6 @@ function build() {
 	install_lib_icu_cross
 	icu_force_data_install
 	install_lib_liblcf
-	install_lib_cmake $SDL2_DIR $SDL2_ARGS
 	install_lib_cmake $SDL3_DIR $SDL3_ARGS
 }
 

linux-static/1_download_library.sh

@@ -98,10 +98,6 @@ download_and_extract $ICU_URL
 rm -f $ICUDATA_FILES
 download_and_extract $ICUDATA_URL
 
-# SDL2
-rm -rf $SDL2_DIR
-download_and_extract $SDL2_URL
-
 # SDL3
 rm -rf $SDL3_DIR
 download_and_extract $SDL3_URL

linux-static/2_build_toolchain.sh

@@ -66,7 +66,6 @@ install_lib $LHASA_DIR $LHASA_ARGS
 install_lib_cmake $FMT_DIR $FMT_ARGS
 install_lib $ICU_DIR/source $ICU_ARGS
 install_lib_liblcf
-install_lib $SDL2_DIR $SDL2_ARGS PULSEAUDIO_CFLAGS=-Ixxxdir PULSEAUDIO_LIBS=-lxxxlib
 install_lib_cmake $FREEIMAGE_DIR $FREEIMAGE_ARGS
 
 # Ensure that SDL3 finds the system libraries