Skip to content

Update Android NDK #184

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 3 commits into from
Oct 2, 2024
Merged

Update Android NDK #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90bab71
android: use ndk 28 beta 1
Totto16 Oct 2, 2024
489c5e5
android: update gradle plugin
Totto16 Oct 2, 2024
fa96f7f
android: update android sdk 35
Totto16 Oct 2, 2024
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;27.1.12297006"
sdkmanager --install "ndk;28.0.12433566"

- name: Build native libraries
run: |
Expand Down
6 changes: 3 additions & 3 deletions platforms/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,14 +247,14 @@ android {
targetCompatibility JavaVersion.VERSION_21
}

compileSdkVersion 34
ndkVersion "27.1.12297006"
compileSdkVersion 35
ndkVersion "28.0.12433566"
defaultConfig {
if (buildAsApplication) {
applicationId "com.github.oopetris"
}
minSdkVersion 21
targetSdkVersion 34
targetSdkVersion 35
versionCode 7
versionName(versionString)
}
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/app/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ APP_STL := c++_shared
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64

# used SDK number
APP_PLATFORM := android-34
APP_PLATFORM := android-35

# support 16KB page sizes:
# see: https://developer.android.com/guide/practices/page-sizes
Expand Down
2 changes: 1 addition & 1 deletion platforms/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.0'
classpath 'com.android.tools.build:gradle:8.6.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions platforms/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jan 02 02:01:38 CET 2024
#Wed Oct 02 13:43:32 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
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 @@ -4,8 +4,8 @@ set -e

mkdir -p toolchains

export NDK_VER_DOWNLOAD="r27b"
export NDK_VER_DESC="r27b"
export NDK_VER_DOWNLOAD="r28-beta1"
export NDK_VER_DESC="r28-beta1"

export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
export ANDROID_NDK_HOME="$BASE_PATH"
Expand Down
Loading