[Android] update android sdk version

.github/workflows/full-android.yaml

@@ -39,7 +39,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:108
+            image: ghcr.io/project-chip/chip-build-android:110
             volumes:
                 - "/tmp/log_output:/tmp/test_logs"
 

.github/workflows/smoketest-android.yaml

@@ -37,7 +37,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-android:108
+            image: ghcr.io/project-chip/chip-build-android:110
             volumes:
                 - "/:/runner-root-volume"
                 - "/tmp/log_output:/tmp/test_logs"

integrations/cloudbuild/smoke-test.yaml

@@ -140,7 +140,7 @@ steps:
           - name: pwenv
             path: /pwenv
 
-    - name: "ghcr.io/project-chip/chip-build-vscode:108"
+    - name: "ghcr.io/project-chip/chip-build-vscode:110"
       id: Android
       env:
           - PW_ENVIRONMENT_ROOT=/pwenv

scripts/build/builders/android.py

@@ -164,9 +164,9 @@ def validate_build_environment(self):
             os.environ["ANDROID_HOME"], "tools", "bin", "sdkmanager"
         )
 
-        # New SDK manager at cmdline-tools/latest/bin/
+        # New SDK manager at cmdline-tools/10.0/bin/
         new_sdk_manager = os.path.join(
-            os.environ["ANDROID_HOME"], "cmdline-tools", "latest", "bin", "sdkmanager"
+            os.environ["ANDROID_HOME"], "cmdline-tools", "10.0", "bin", "sdkmanager"
         )
         if not (
             os.path.isfile(sdk_manager) and os.access(sdk_manager, os.X_OK)
@@ -413,7 +413,7 @@ def generate(self):
             new_sdk_manager = os.path.join(
                 os.environ["ANDROID_HOME"],
                 "cmdline-tools",
-                "latest",
+                "10.0",
                 "bin",
                 "sdkmanager",
             )

src/app/server/java/BUILD.gn

@@ -74,9 +74,9 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-26/android.jar to access BLE items)
+  #  ..../platforms/android-30/android.jar to access BLE items)
 }
 
 java_prebuilt("android") {
-  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
 }

src/controller/java/BUILD.gn

@@ -679,7 +679,7 @@ android_library("java") {
   ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-26/android.jar to access BLE items)
+  #  ..../platforms/android-30/android.jar to access BLE items)
 }
 
 if (chip_link_tests) {
@@ -711,7 +711,7 @@ if (chip_link_tests) {
     javac_flags = [ "-Xlint:deprecation" ]
 
     # TODO: add classpath support (we likely need to add something like
-    #  ..../platforms/android-26/android.jar to access BLE items)
+    #  ..../platforms/android-30/android.jar to access BLE items)
   }
 
   android_library("tests") {
@@ -746,12 +746,12 @@ if (chip_link_tests) {
     javac_flags = [ "-Xlint:deprecation" ]
 
     # TODO: add classpath support (we likely need to add something like
-    #  ..../platforms/android-26/android.jar to access BLE items)
+    #  ..../platforms/android-30/android.jar to access BLE items)
   }
 }
 
 if (!matter_enable_java_compilation) {
   java_prebuilt("android") {
-    jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
+    jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
   }
 }

src/messaging/tests/java/BUILD.gn

@@ -79,11 +79,11 @@ android_library("java") {
   javac_flags = [ "-Xlint:deprecation" ]
 
   # TODO: add classpath support (we likely need to add something like
-  #  ..../platforms/android-26/android.jar to access BLE items)
+  #  ..../platforms/android-30/android.jar to access BLE items)
 }
 
 if (!matter_enable_java_compilation) {
   java_prebuilt("android") {
-    jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
+    jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
   }
 }

src/platform/android/BUILD.gn

@@ -142,5 +142,5 @@ android_library("java") {
 }
 
 java_prebuilt("android_sdk") {
-  jar_path = "${android_sdk_root}/platforms/android-26/android.jar"
+  jar_path = "${android_sdk_root}/platforms/android-30/android.jar"
 }