Skip to content

Commit 9fb49e9

Browse files
authored
Update android devenv to support android 16 (#2546)
- target_sdk: 35 => 36 - agp: 8.7.3 => 8.10.0 - buildtools 34.0.0 => 35.0.0 - Remove deprecated DSL config: renderscriptDebuggable - Update CHANGELOG.md - Update docs/DevSetup.md
1 parent f5740bf commit 9fb49e9

File tree

15 files changed

+30
-30
lines changed

15 files changed

+30
-30
lines changed

1k/build.profiles

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ndk=r23d
5050

5151
# The android target sdk version, @gradle
5252
# as latest as possible
53-
target_sdk=35
53+
target_sdk=36
5454

5555
# The android min sdk version, @gradle
5656
# as min as possible
@@ -62,11 +62,11 @@ gradle=8.13
6262

6363
# The android gradle plugin, @setup.ps1
6464
# as stable as possible, match with build-tools,android-studio
65-
agp=8.7.3
65+
agp=8.10.0
6666

6767
# The android build-tools, @axmol-cmdline @gradle
6868
# as stable as possible, match with agp,android-studio
69-
buildtools=34.0.0
69+
buildtools=35.0.0
7070

7171
# The android studio, @hint
7272
# as latest as possible, but match with agp, build-tools

CHANGELOG.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
## axmol-2.6.0 ?? 2025
22

3+
### Significant changes relative to 2.5.0:
4+
5+
- Update android devenv to support android 16 by @halx99 in https://github.com/axmolengine/axmol/pull/2546
6+
- Update Android Studio minimum required version to `2024.3.2`
7+
38
### Bug fixes
49

5-
- Fix https://github.com/axmolengine/axmol/issues/2545 install pwsh fail on ubuntu-25.04
6-
- Fix wasm build fail on windows host by @halx99 in https://github.com/axmolengine/axmol/pull/2511
10+
- Fix https://github.com/axmolengine/axmol/issues/2545 install pwsh fail on ubuntu-25.04 by @halx99
11+
- Fix wasm build fail on windows by @halx99 in https://github.com/axmolengine/axmol/pull/2511
712
- Fix PNG_ARM_NEON_OPT flag by @halx99 in https://github.com/axmolengine/axmol/pull/2512
813
- Fix #2504 play opus audio fail when build with Apple OpenAL.framework by @halx99 in https://github.com/axmolengine/axmol/pull/2506
914
- Fix typo in pkg_check_modules for GTK3. by @j-jorge in https://github.com/axmolengine/axmol/pull/2534
1015
- Fix character, underline and strikethrough drawing over label boundary for Overflow::CLAMP mode by @rh101 in https://github.com/axmolengine/axmol/pull/2515
1116
- Fix for clamped and left-aligned text with certain character sets by @rh101 in https://github.com/axmolengine/axmol/pull/2518
1217
- Fix wasm raise runtime error due to HEAPU8 was not exported by @halx99
18+
- Fix decompressGZ infinite-loop when input data invalid by @halx99 in https://github.com/axmolengine/axmol/pull/2544
1319

1420
### Improvements
1521

1622
- Improve ZipUtils::decompressGZ by @halx99 in https://github.com/axmolengine/axmol/pull/2544
17-
- Fix decompressGZ inf-loop when input data invalid
1823
- Parsing uncompress size and reserve exactly avoid waste memory
1924
- Valid input size
2025
- Improve ogg audio files, detect codec via file header by @halx99 in https://github.com/axmolengine/axmol/pull/2500
@@ -38,6 +43,13 @@
3843
- Improve isolate project axslcc find prompt by @halx99
3944
- Move simd intrinsics detection from 3rd into core by @halx99
4045
- Add minimum version to build docs support by @halx99, now the ci will only build & deploy axmol-2.3+ docs
46+
- Remove deprecated DSL config: renderscriptDebuggable by @halx99 in https://github.com/axmolengine/axmol/pull/2546
47+
48+
### SDKs & Tools updates
49+
50+
- agp: 8.7.3 => 8.10.0
51+
- android target sdk: 35 => 36
52+
- android sdk build tools: 34.0.0 => 35.0.0
4153

4254
### 3rdparty updates
4355

docs/DevSetup.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,19 +162,19 @@ Please see the [Windows workflow guide](https://github.com/axmolengine/axmol/iss
162162

163163
### Android (with Android Studio)
164164

165-
1. Install [Android Studio 2024.2.1+](https://developer.android.com/studio).
165+
1. Install [Android Studio 2024.3.2+](https://developer.android.com/studio).
166166
2. When starting Android Studio for the first time, it will guide you through the installation of the SDK and other tools. Please make sure that you do install them.
167167
3. Ensure that the ANDROID_HOME environment variable is set up correctly to point to the Android SDK folder.
168168
4. Open a *new* Powershell instance, and enter the `axmol` root directory in Powershell.
169169
5. Run `./setup.ps1 -p android` to download the a supported version of the NDK, which in this case is r23d. You can set a project to use a different version of the NDK.
170170
6. Start Android Studio and choose [Open an existing Android Studio Project] and select your project. For example, the existing `cpp-test` project located in `axmol\tests\cpp-tests\proj.android`.
171171
7. Start Android Studio and open 'Tools' -> 'SDKManager', then switch to 'SDK Tools', check the 'Show Package Details' field, and choose the following tools clicking the button 'Apply' to install them:
172-
- Android SDK Platform 34
173-
- Android Gradle Plugin (AGP) 8.7.3
174-
- Android SDK Build-Tools 34.0.0 match with AGP, refer to: <https://developer.android.com/studio/releases/gradle-plugin>
175-
- Gradle 8.11.1
172+
- Android SDK Platform 36
173+
- Android Gradle Plugin (AGP) 8.10.0
174+
- Android SDK Build-Tools 35.0.0 match with AGP, refer to: <https://developer.android.com/studio/releases/gradle-plugin>
175+
- Gradle 8.13
176176
- NDK r23c, if you need support Android 15 16KB page size, you must use r23d or r27+
177-
- __IMPORTANT__: NDK r26+ is required for C++20 support.
177+
- __IMPORTANT__: axmol itself not use all c++20 features, so just require ndk-r23c+, if you need more c++20 feature in your game project, consider use NDK r26+
178178
8. Wait for the `Gradle sync` to finish.
179179

180180
Note: if you use non-SDK provided CMake, you will need to download `ninja` from <https://github.com/ninja-build/ninja/releases>, and copy `ninja.exe` to CMake's bin directory.

templates/common/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources = true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -82,7 +81,6 @@ android {
8281
debug {
8382
debuggable true
8483
jniDebuggable true
85-
renderscriptDebuggable true
8684
}
8785
}
8886

templates/common/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/cpp-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources = true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/cpp-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/fairygui-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

tests/fairygui-tests/proj.android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88

99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.7.3'
10+
classpath 'com.android.tools.build:gradle:8.10.0'
1111

1212
// NOTE: Do not place your application dependencies here; they belong
1313
// in the individual module build.gradle files

tests/live2d-tests/proj.android/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ android {
6969
release {
7070
debuggable false
7171
jniDebuggable false
72-
renderscriptDebuggable false
7372
minifyEnabled true
7473
shrinkResources true
7574
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -81,7 +80,6 @@ android {
8180
debug {
8281
debuggable true
8382
jniDebuggable true
84-
renderscriptDebuggable true
8583
}
8684
}
8785

0 commit comments

Comments
 (0)