Skip to content

Commit e8a16dc

Browse files
authored
Merge pull request #184 from OpenBrickProtocolFoundation/udpate_android_ndk
Update Android NDK
2 parents 8fa991a + fa96f7f commit e8a16dc

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/android.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
- name: Setup NDK
4848
run: |
49-
sdkmanager --install "ndk;27.1.12297006"
49+
sdkmanager --install "ndk;28.0.12433566"
5050
5151
- name: Build native libraries
5252
run: |

platforms/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,14 @@ android {
247247
targetCompatibility JavaVersion.VERSION_21
248248
}
249249

250-
compileSdkVersion 34
251-
ndkVersion "27.1.12297006"
250+
compileSdkVersion 35
251+
ndkVersion "28.0.12433566"
252252
defaultConfig {
253253
if (buildAsApplication) {
254254
applicationId "com.github.oopetris"
255255
}
256256
minSdkVersion 21
257-
targetSdkVersion 34
257+
targetSdkVersion 35
258258
versionCode 7
259259
versionName(versionString)
260260
}

platforms/android/app/jni/Application.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ APP_STL := c++_shared
66
APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
77

88
# used SDK number
9-
APP_PLATFORM := android-34
9+
APP_PLATFORM := android-35
1010

1111
# support 16KB page sizes:
1212
# see: https://developer.android.com/guide/practices/page-sizes

platforms/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.5.0'
9+
classpath 'com.android.tools.build:gradle:8.6.1'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 02 02:01:38 CET 2024
1+
#Wed Oct 02 13:43:32 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

platforms/build-android.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44

55
mkdir -p toolchains
66

7-
export NDK_VER_DOWNLOAD="r27b"
8-
export NDK_VER_DESC="r27b"
7+
export NDK_VER_DOWNLOAD="r28-beta1"
8+
export NDK_VER_DESC="r28-beta1"
99

1010
export BASE_PATH="$PWD/toolchains/android-ndk-$NDK_VER_DESC"
1111
export ANDROID_NDK_HOME="$BASE_PATH"

0 commit comments

Comments
 (0)