Merge branch 'bazelbuild:main' into download

.bazelci/presubmit.yml

@@ -1,13 +1,13 @@
 ---
 buildifier: latest
+bazel: last_green
 
 basic_example: &basic_example
   working_directory: examples/basic
   build_flags:
     - "--incompatible_disallow_empty_glob"
-    - "--noincompatible_enable_cc_toolchain_resolution"
-    - "--fat_apk_cpu=arm64-v8a,x86"
-    - "--android_crosstool_top=@androidndk//:toolchain"
+    - "--incompatible_enable_android_toolchain_resolution"
+    - "--android_platforms=//:arm64-v8a,//:x86"
     - "--enable_bzlmod=False"
   build_targets:
     - "//java/com/app:app"
@@ -16,9 +16,8 @@ basic_example_bzlmod: &basic_example_bzlmod
   working_directory: examples/basic
   build_flags:
     - "--incompatible_disallow_empty_glob"
-    - "--noincompatible_enable_cc_toolchain_resolution"
-    - "--fat_apk_cpu=arm64-v8a,x86"
-    - "--android_crosstool_top=@androidndk//:toolchain"
+    - "--incompatible_enable_android_toolchain_resolution"
+    - "--android_platforms=//:arm64-v8a,//:x86"
     - "--enable_bzlmod=True"
   build_targets:
     - "//java/com/app:app"
@@ -27,9 +26,8 @@ cpu_features: &cpu_features
   working_directory: examples/cpu_features
   build_flags:
     - "--incompatible_disallow_empty_glob"
-    - "--noincompatible_enable_cc_toolchain_resolution"
-    - "--cpu=arm64-v8a"
-    - "--crosstool_top=@androidndk//:toolchain"
+    - "--incompatible_enable_android_toolchain_resolution"
+    - "--platforms=//:arm64-v8a"
   build_targets:
     - "//:all"
 
@@ -45,15 +43,21 @@ macos: &macos
 
 tasks:
   basic_example_ubuntu2004:
+    name: Basic Example
     <<: [*ubuntu2004, *basic_example]
   basic_example_bzlmod_ubuntu2004:
+    name: Basic Example Bzlmod
     <<: [*ubuntu2004, *basic_example_bzlmod]
   basic_example_macos:
+    name: Basic Example
     <<: [*macos, *basic_example]
   basic_example_bzlmod_macos:
+    name: Basic Example Bzlmod
     <<: [*macos, *basic_example_bzlmod]
 
   cpu_features_ubuntu2004:
+    name: CPU Features
     <<: [*ubuntu2004, *cpu_features]
   cpu_features_macos:
+    name: CPU Features
     <<: [*macos, *cpu_features]

examples/basic/BUILD.bazel

@@ -0,0 +1,15 @@
+platform(
+    name = "arm64-v8a",
+    constraint_values = [
+        "@platforms//cpu:arm64",
+        "@platforms//os:android",
+    ],
+)
+
+platform(
+    name = "x86",
+    constraint_values = [
+        "@platforms//cpu:x86_32",
+        "@platforms//os:android",
+    ],
+)