Bug 1880792, 1880801, 1880805 - Compile Focus, Fenix, AC and GV with SDK 35. r=android-reviewers,geckoview-reviewers,ohall

Differential Revision: https://phabricator.services.mozilla.com/D217428

build.gradle

@@ -125,7 +125,7 @@ allprojects {
         buildId = getBuildId()
 
         buildToolsVersion = mozconfig.substs.ANDROID_BUILD_TOOLS_VERSION
-        compileSdkVersion = tryInt(mozconfig.substs.ANDROID_TARGET_SDK)
+        compileSdkVersion = tryInt(mozconfig.substs.ANDROID_COMPILE_SDK)
         targetSdkVersion = tryInt(mozconfig.substs.ANDROID_TARGET_SDK)
         minSdkVersion = tryInt(mozconfig.substs.MOZ_ANDROID_MIN_SDK_VERSION)
         manifestPlaceholders = [

build/moz.configure/android-sdk.configure

@@ -58,7 +58,8 @@ def android_sdk_version():
     # If you think you can't handle the whole set of changes, please reach out to the Release
     # Engineering team.
     return namespace(
-        build_tools_version="34.0.0",
+        build_tools_version="35.0.0",
+        compile_sdk_version="35",
         target_sdk_version="34",
         min_sdk_version="21",
     )
@@ -155,3 +156,4 @@ set_config("ANDROID_SDK_ROOT", android_sdk_root)
 
 set_config("ANDROID_BUILD_TOOLS_VERSION", android_sdk_version.build_tools_version)
 set_config("ANDROID_TARGET_SDK", android_sdk_version.target_sdk_version)
+set_config("ANDROID_COMPILE_SDK", android_sdk_version.compile_sdk_version)

gfx/wr/wrench/Cargo.toml

@@ -68,7 +68,7 @@ opengles_version_minor = 0
 
 [package.metadata.android.sdk]
 # keep it in sync with android-sdk-version in android-sdk.configure
-target_sdk_version = 34
+target_sdk_version = 35
 min_sdk_version = 18
 
 [package.metadata.android.application]

mobile/android/android-components/.config.yml

@@ -3,6 +3,6 @@ componentsGroupId: "org.mozilla.components"
 
 # Synchronized build configuration for all modules
 jvmTargetCompatibility: 17
-compileSdkVersion: 34
+compileSdkVersion: 35
 minSdkVersion: 21
 targetSdkVersion: 34

mobile/android/android-components/docs/changelog.md

@@ -5,6 +5,8 @@ permalink: /changelog/
 ---
 
 # 131.0 (In Development)
+* **All components**
+  * ⚠️Increased `compileSdkVersion` to 35 (Android 15)
 
 # 130.0
 

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/doc-files/CHANGELOG.md

@@ -16,6 +16,7 @@ exclude: true
 ## v131
 - Added [`GeckoDisplay.windowInsetsChanged`][131.1].
 - Added [`GeckoView.addWindowInsetsListener`][131.2] and [`GeckoView.removeWindowInsetsListener`][131.3] to allow listening WindowInsets changes of Activity's root window with multiple listeners.
+- ⚠️Increased `compileSdkVersion` to 35 (Android 15)
 
 [131.1]: {{javadoc_uri}}/GeckoDisplay.html#windowInsetsChanged
 [131.2]: {{javadoc_uri}}/GeckoView.html#addWindowInsetsListener

python/mozboot/mozboot/android-packages.txt

@@ -1,4 +1,4 @@
 emulator
 platform-tools
-build-tools;34.0.0
-platforms;android-34
+build-tools;35.0.0
+platforms;android-35

testing/web-platform/tests/tools/wpt/android.py

@@ -288,8 +288,8 @@ def install(logger, dest=None, reinstall=False, prompt=True):
 
         if new_install:
             packages = ["platform-tools",
-                        "build-tools;34.0.0",
-                        "platforms;android-34",
+                        "build-tools;35.0.0",
+                        "platforms;android-35",
                         "emulator"]
 
             install_android_packages(logger, paths, packages, prompt=prompt)