Merge pull request #209 from OpenBrickProtocolFoundation/update_ndk_t…

…o_28_beta3 build: update the ndk version for android to 28-rc2 (beta3)
OpenBrickProtocolFoundation · Jan 16, 2025 · f7afc10 · f7afc10
2 parents 5f32b51 + 31f8e58
commit f7afc10
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 123 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Setup NDK
         run: |
-          sdkmanager --install "ndk;28.0.12674087"
+          sdkmanager --install "ndk;28.0.12916984"
 
       - name: Build native libraries
         run: |

diff --git a/platforms/android/app/build.gradle b/platforms/android/app/build.gradle
@@ -248,7 +248,7 @@ android {
     }
 
     compileSdkVersion 35
-    ndkVersion "28.0.12674087"
+    ndkVersion "28.0.12916984"
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.github.oopetris"

diff --git a/platforms/build-android.sh b/platforms/build-android.sh
@@ -6,8 +6,8 @@ if [ ! -d "toolchains" ]; then
     mkdir -p toolchains
 fi
 
-export NDK_VER_DOWNLOAD="r28-beta2"
-export NDK_VER_DESC="r28-beta2"
+export NDK_VER_DOWNLOAD="r28-beta3"
+export NDK_VER_DESC="r28-beta3"
 
 export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
 export ANDROID_NDK_HOME="$BASE_PATH"

diff --git a/platforms/build-web.sh b/platforms/build-web.sh
@@ -23,13 +23,10 @@ PATCH_DIR="platforms/emscripten"
 
 if ! [ -e "$EMSCRIPTEN_PACTH_FILE" ]; then
     ##TODO: upstream those patches
-    # see: https://github.com/emscripten-core/emscripten/pull/18379/commits
-    # and: https://github.com/emscripten-core/emscripten/pull/18379
+    # see: https://github.com/emscripten-core/emscripten/pull/18379
     # and: https://github.com/emscripten-core/emscripten/pull/22946
 
     git apply --unsafe-paths -p1 --directory="$EMSCRIPTEN_UPSTREAM_ROOT" "$PATCH_DIR/sdl2_image_port.diff"
-    git apply --unsafe-paths -p1 --directory="$EMSCRIPTEN_UPSTREAM_ROOT" "$PATCH_DIR/sdl2_mixer_port.diff"
-    git apply --unsafe-paths -p1 --directory="$EMSCRIPTEN_UPSTREAM_ROOT" "$PATCH_DIR/default_settings.diff"
 
     touch "$EMSCRIPTEN_PACTH_FILE"
 fi
@@ -40,7 +37,7 @@ fi
 EMSDK_QUIET=1 source "$EMSCRIPTEN_ROOT/emsdk_env.sh" >/dev/null
 
 ## build theneeded dependencies
-embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 "sdl2_mixer:formats=mp3" libpng-mt "sdl2_image:formats=png,svg:mt=1" icu-mt
+embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 "sdl2_mixer-mp3-mt" libpng-mt "sdl2_image:formats=png,svg:mt=1" icu-mt
 
 export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_UPSTREAM_ROOT/cache/sysroot"
 

diff --git a/platforms/emscripten/default_settings.diff b/platforms/emscripten/default_settings.diff
diff --git a/platforms/emscripten/sdl2_mixer_port.diff b/platforms/emscripten/sdl2_mixer_port.diff
diff --git a/tools/dependencies/meson.build b/tools/dependencies/meson.build
@@ -60,7 +60,7 @@ if meson.is_cross_build()
             ['SDL2-mt', 'SDL2'],
             ['SDL2_ttf'],
             ['mpg123'],
-            ['SDL2_mixer_mp3', 'SDL2_mixer'],
+            ['SDL2_mixer-mp3-mt', 'SDL2_mixer'],
             ['SDL2_image-png-svg-mt', 'SDL2_image'],
             ['icu_common-mt', 'icu-uc'],
         ]