From 55ee34b2ca4cc50fd1ff152ad2085e2bb0a35f34 Mon Sep 17 00:00:00 2001 From: John Cater Date: Fri, 13 Oct 2023 12:00:05 -0400 Subject: [PATCH] Add Android Platforms build flags. Part of https://github.com/bazelbuild/bazel/issues/16285. --- .bazelci/presubmit.yml | 8 ++++++++ examples/android/BUILD.bazel | 4 ++-- examples/android/platform_mappings | 4 ---- 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 examples/android/platform_mappings diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 0ae58a3d27..da3386481a 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 cad573f94b..73137e9804 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 d66d78f0be..0000000000 --- a/examples/android/platform_mappings +++ /dev/null @@ -1,4 +0,0 @@ -flags: - --cpu=arm64-v8a - --crosstool_top=//external:android/crosstool - //:android_aarch64