diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2024-08-08 08:05:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-08 08:05:51 +1000 |
| commit | 66d8b33362a90870df8c6c5d99640e16b70f9fb5 (patch) | |
| tree | 846f7618007fbcf7ce6fc48d00cb4e326e893b9d | |
| parent | 8adee68acddd62d915a3ab7b0279a71c8ddb6da0 (diff) | |
| parent | 1ede7fdf46eca863fd29647b44ba261863034dca (diff) | |
Merge pull request #25583 from fuzzard/bp_agp8
[BP] Bump Android SDK 34 + AGP 8.1
| -rw-r--r-- | cmake/platform/android/android.cmake | 2 | ||||
| -rw-r--r-- | docs/README.Android.md | 4 | ||||
| -rw-r--r-- | tools/android/packaging/build.gradle | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmake/platform/android/android.cmake b/cmake/platform/android/android.cmake index 26c7821f89..49105e353d 100644 --- a/cmake/platform/android/android.cmake +++ b/cmake/platform/android/android.cmake @@ -4,7 +4,7 @@ set(APP_RENDER_SYSTEM gles) list(APPEND PLATFORM_OPTIONAL_DEPS LibDovi) # Store SDK compile version -set(TARGET_SDK 33) +set(TARGET_SDK 34) # Minimum supported SDK version set(TARGET_MINSDK 21) diff --git a/docs/README.Android.md b/docs/README.Android.md index 8ce91a31e1..08d04c82a2 100644 --- a/docs/README.Android.md +++ b/docs/README.Android.md @@ -68,7 +68,7 @@ sudo apt install autoconf bison build-essential curl default-jdk flex gawk git g > If you're running a 32bit Debian/Ubuntu distribution, remove `lib32stdc++6 lib32z1 lib32z1-dev` from the command. > [!NOTE] -> Gradle 7.0.2+ requires Jave Runtime 11+. Check java version by running `java --version`. If version is < 11, set JAVA_HOME to java 11+ home directory._ +> Gradle 8.0+ requires JDK 17+. Check java version by running `java --version`. If version is < 17, set `JAVA_HOME` environment variable to java 17+ home directory. **[back to top](#table-of-contents)** @@ -98,7 +98,7 @@ Before Android SDK can be used, you need to accept the licenses and configure it cd $HOME/android-tools/android-sdk-linux/cmdline-tools/bin ./sdkmanager --sdk_root=$(pwd)/../.. --licenses ./sdkmanager --sdk_root=$(pwd)/../.. platform-tools -./sdkmanager --sdk_root=$(pwd)/../.. "platforms;android-33" +./sdkmanager --sdk_root=$(pwd)/../.. "platforms;android-34" ./sdkmanager --sdk_root=$(pwd)/../.. "build-tools;33.0.1" ./sdkmanager --sdk_root=$(pwd)/../.. "ndk;21.4.7075529" ``` diff --git a/tools/android/packaging/build.gradle b/tools/android/packaging/build.gradle index 6c30dfffc8..1c08ce20c8 100644 --- a/tools/android/packaging/build.gradle +++ b/tools/android/packaging/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.0' + classpath 'com.android.tools.build:gradle:8.1.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files |