aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Cater <jcater@google.com>2023-10-16 06:56:12 -0400
committerGitHub <noreply@github.com>2023-10-16 11:56:12 +0100
commitb4135d6a4a1dc330e132742e5cbf8f06b76d92a7 (patch)
tree7d05f43e84d1efac8e132362926ac664c196fe56
parent9bccc514d734c76914337ff034e9280aece29ea5 (diff)
downloadbazelbuild-rules_rust-b4135d6a4a1dc330e132742e5cbf8f06b76d92a7.tar.gz
Add Android Platforms build flags. (#2198)
Part of https://github.com/bazelbuild/bazel/issues/16285.
-rw-r--r--.bazelci/presubmit.yml8
-rw-r--r--examples/android/BUILD.bazel4
-rw-r--r--examples/android/platform_mappings4
3 files changed, 10 insertions, 6 deletions
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 0ae58a3d..da338648 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -574,12 +574,20 @@ tasks:
name: Android Examples
platform: ubuntu2004
working_directory: examples/android
+ bazel: "last_green"
+ build_flags:
+ - "--incompatible_enable_android_toolchain_resolution"
+ - "--android_platforms=//:arm64-v8a"
build_targets:
- "//:android_app"
android_examples_macos:
name: Android Examples
platform: macos
working_directory: examples/android
+ bazel: "last_green"
+ build_flags:
+ - "--incompatible_enable_android_toolchain_resolution"
+ - "--android_platforms=//:arm64-v8a"
build_targets:
- "//:android_app"
ios_examples:
diff --git a/examples/android/BUILD.bazel b/examples/android/BUILD.bazel
index cad573f9..73137e98 100644
--- a/examples/android/BUILD.bazel
+++ b/examples/android/BUILD.bazel
@@ -38,9 +38,9 @@ android_binary(
)
platform(
- name = "android_aarch64",
+ name = "arm64-v8a",
constraint_values = [
- "@platforms//cpu:aarch64",
+ "@platforms//cpu:arm64",
"@platforms//os:android",
],
)
diff --git a/examples/android/platform_mappings b/examples/android/platform_mappings
deleted file mode 100644
index d66d78f0..00000000
--- a/examples/android/platform_mappings
+++ /dev/null
@@ -1,4 +0,0 @@
-flags:
- --cpu=arm64-v8a
- --crosstool_top=//external:android/crosstool
- //:android_aarch64