From 9c76343dfc365ee54140fd83cb3b580526e870ed Mon Sep 17 00:00:00 2001 From: JiaYan Lin Date: Thu, 15 Feb 2024 03:07:06 +0000 Subject: [PATCH 1/3] Add --android_platforms and turn on toolchain resolution --- .bazelci/presubmit.yml | 4 ++++ MODULE.bazel | 2 ++ 2 files changed, 6 insertions(+) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 9d3ca1709..93c2de162 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -103,5 +103,9 @@ tasks: working_directory: examples/basicapp build_flags: <<: *rules_flags + ? "--android_platforms='//:armeabi-v7a'" + ? "--enable_bzlmod" + ? "--incompatible_enable_android_toolchain_resolution=true" + ? "--java_runtime_version=17" build_targets: - "//java/com/basicapp:basic_app" diff --git a/MODULE.bazel b/MODULE.bazel index c3cb43f4b..181da81ae 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,6 +21,8 @@ register_toolchains("//toolchains/android_sdk:all") register_toolchains("//toolchains/emulator:all") +register_toolchains("@bazel_tools//tools/cpp:all") + # go-related dependency setup bazel_dep(name = "rules_go", version = "0.43.0", repo_name = "io_bazel_rules_go") bazel_dep(name = "gazelle", version = "0.28.0", repo_name = "bazel_gazelle") From 6a0222f269badc0cdc18dafb3acfb1ad6772e300 Mon Sep 17 00:00:00 2001 From: JiaYan Lin Date: Thu, 15 Feb 2024 14:57:43 +0000 Subject: [PATCH 2/3] fix path --- .bazelci/presubmit.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 93c2de162..2e6024e57 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -4,7 +4,8 @@ bazel: last_green tools_flags: &tools_flags ? "--enable_bzlmod=false" - ? "--incompatible_enable_android_toolchain_resolution=false" + ? "--incompatible_enable_android_toolchain_resolution=true" + ? "--android_platforms='//:armeabi-v7a'" # Sandboxed SDK tools depend on libraries that require Java runtime 17 or higher. ? "--java_runtime_version=17" rules_flags: &rules_flags @@ -103,8 +104,8 @@ tasks: working_directory: examples/basicapp build_flags: <<: *rules_flags - ? "--android_platforms='//:armeabi-v7a'" ? "--enable_bzlmod" + ? "--android_platforms='@rules_android//:armeabi-v7a'" ? "--incompatible_enable_android_toolchain_resolution=true" ? "--java_runtime_version=17" build_targets: From a3397f5e6a6ffb436ba6e5bbb5262a6afbb77678 Mon Sep 17 00:00:00 2001 From: JiaYan Lin Date: Thu, 15 Feb 2024 15:14:34 +0000 Subject: [PATCH 3/3] fix path --- .bazelci/presubmit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml index 2e6024e57..9f22ddb1c 100644 --- a/.bazelci/presubmit.yml +++ b/.bazelci/presubmit.yml @@ -5,7 +5,7 @@ bazel: last_green tools_flags: &tools_flags ? "--enable_bzlmod=false" ? "--incompatible_enable_android_toolchain_resolution=true" - ? "--android_platforms='//:armeabi-v7a'" + ? "--android_platforms=//:armeabi-v7a" # Sandboxed SDK tools depend on libraries that require Java runtime 17 or higher. ? "--java_runtime_version=17" rules_flags: &rules_flags @@ -105,7 +105,7 @@ tasks: build_flags: <<: *rules_flags ? "--enable_bzlmod" - ? "--android_platforms='@rules_android//:armeabi-v7a'" + ? "--android_platforms=@rules_android//:armeabi-v7a" ? "--incompatible_enable_android_toolchain_resolution=true" ? "--java_runtime_version=17" build_targets: