Skip to content

build: update the ndk version for android to 28-rc2 (beta3) #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 16, 2025
Merged

build: update the ndk version for android to 28-rc2 (beta3) #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd4e797
build: update the ndk version for android to 28-rc2 (beta3)
Totto16 Jan 15, 2025
31f8e58
fix(build): remove now unnecessary emsdk patches
Totto16 Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ android {
}

compileSdkVersion 35
ndkVersion "28.0.12674087"
ndkVersion "28.0.12916984"
defaultConfig {
if (buildAsApplication) {
applicationId "com.github.oopetris"
Expand Down
4 changes: 2 additions & 2 deletions platforms/build-android.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 2 additions & 5 deletions platforms/build-web.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"

Expand Down
13 changes: 0 additions & 13 deletions platforms/emscripten/default_settings.diff
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions platforms/emscripten/sdl2_mixer_port.diff
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tools/dependencies/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
]
Expand Down
Loading