Skip to content

Commit a97c927

Browse files
Add back android config_setting that looks for //external:android/crosstool (#16127) (#16264)
In #15298 `"crosstool_top": "//external:android/crosstool"` was replaced with `"crosstool_top": "@platforms//os:android"`. This breaks users who have not migrated to https://bazel.build/concepts/platforms yet. Closes #16127 COPYBARA_INTEGRATE_REVIEW=#16127 from sifmelcara:add-back-legacy-crosstool-top c643235 PiperOrigin-RevId: 615449874 Co-authored-by: Ming-Chuan <[email protected]>
1 parent 1ffebb2 commit a97c927

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

build_defs/BUILD.bazel

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,23 @@ config_setting(
3535
# For more info on the various crosstool_tops used by NDK Bazel builds, see:
3636
# https://docs.bazel.build/versions/master/android-ndk.html#configuring-the-stl
3737

38+
# When using https://bazel.build/concepts/platforms
3839
config_setting(
3940
name = "config_android",
4041
values = {
4142
"crosstool_top": "@platforms//os:android",
4243
},
4344
)
4445

46+
# When using legacy flags like --android_crosstool_top, --android_cpu, and --fat_apk_cpu
47+
config_setting(
48+
name = "config_android-legacy-default-crosstool",
49+
values = {
50+
# Default of `--android_crosstool_top`
51+
"crosstool_top": "//external:android/crosstool",
52+
},
53+
)
54+
4555
config_setting(
4656
name = "config_android-stlport",
4757
values = {

build_defs/cpp_opts.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ COPTS = select({
2929
# Android and MSVC builds do not need to link in a separate pthread library.
3030
LINK_OPTS = select({
3131
"//build_defs:config_android": [],
32+
"//build_defs:config_android-legacy-default-crosstool": [],
3233
"//build_defs:config_android-stlport": [],
3334
"//build_defs:config_android-libcpp": [],
3435
"//build_defs:config_android-gnu-libstdcpp": [],

0 commit comments

Comments
 (0)