From 25abfe36a3b4ec0c149b9537d3ff73ce5b232f3f Mon Sep 17 00:00:00 2001 From: Zephyron Date: Tue, 22 Apr 2025 16:58:55 +1000 Subject: [PATCH] android: Update build configuration and package identifiers Updates the Android build configuration with several important changes: - Change application ID from com.antutu.ABenchMark to org.citron.citron_emu - Upgrade CMake version from 3.31.6 to 4.0.1 - Update Android Gradle plugin from 8.9.0 to 8.9.2 - Add CMAKE_POLICY_VERSION_MINIMUM=3.5 to CMake arguments - Keep Kotlin version at 1.9.20 These changes align the Android package identifier with the Citron project and update build tool versions to ensure compatibility with modern Android development requirements. Signed-off-by: Zephyron --- src/android/app/build.gradle.kts | 7 ++++--- src/android/build.gradle.kts | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index 428bfdc5d..b0537f50c 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -55,7 +55,7 @@ android { defaultConfig { // TODO If this is ever modified, change application_id in strings.xml - applicationId = "com.antutu.ABenchMark" + applicationId = "org.citron.citron_emu" minSdk = 30 //noinspection EditedTargetSdkVersion targetSdk = 35 @@ -161,7 +161,7 @@ android { externalNativeBuild { cmake { - version = "3.31.6" + version = "4.0.1" path = file("../../../CMakeLists.txt") } } @@ -179,7 +179,8 @@ android { "-DCITRON_USE_BUNDLED_FFMPEG=ON", "-DCITRON_ENABLE_LTO=ON", "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON", - "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON" + "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON", + "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ) abiFilters("arm64-v8a") // , "x86_64") diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts index 8566d9906..4192044ac 100644 --- a/src/android/build.gradle.kts +++ b/src/android/build.gradle.kts @@ -4,8 +4,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.9.0" apply false - id("com.android.library") version "8.9.0" apply false + id("com.android.application") version "8.9.2" apply false + id("com.android.library") version "8.9.2" apply false id("org.jetbrains.kotlin.android") version "1.9.20" apply false }