From 961358b6a75c4231b1ebd672c64de31687bc3763 Mon Sep 17 00:00:00 2001 From: akliuxingyuan Date: Wed, 30 Oct 2024 20:58:23 +0800 Subject: [PATCH] ANDROID_BUILD_TOOLS_VERSION --- automation/iceraven/install-sdk.sh | 2 +- gradle/mozconfig.gradle | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/iceraven/install-sdk.sh b/automation/iceraven/install-sdk.sh index 593248a280a2..1845fdfba624 100755 --- a/automation/iceraven/install-sdk.sh +++ b/automation/iceraven/install-sdk.sh @@ -20,7 +20,7 @@ popd export ANDROID_SDK_ROOT=$HOME/android-sdk/android-sdk-linux # Install the weirdly missing NDK -${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;27.0.12077973" +${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin/sdkmanager "ndk;27.2.12479018" # Point the build at the tools echo "sdk.dir=${ANDROID_SDK_ROOT}" >> local.properties diff --git a/gradle/mozconfig.gradle b/gradle/mozconfig.gradle index e8e479538706..3bc5b08e68f1 100644 --- a/gradle/mozconfig.gradle +++ b/gradle/mozconfig.gradle @@ -11,6 +11,7 @@ gradle.ext.mozconfig.substs.MOZ_APP_VERSION = file("${projectRootDir}/version.tx gradle.ext.mozconfig.substs.MOZ_ANDROID_FAT_AAR_ARCHITECTURES = true gradle.ext.mozconfig.substs.MOZ_UPDATE_CHANNEL = 'release' gradle.ext.mozconfig.substs.ALLOW_INSECURE_GRADLE_REPOSITORIES = true +gradle.ext.mozconfig.substs.ANDROID_BUILD_TOOLS_VERSION = "35.0.0" // build/moz.configure/android-sdk.configure#L61 gradle.ext.mozconfig.topobjdir = System.getProperty("user.dir") gradle.ext.vcsHashFileContent = false