diff options
| author | Liz Kammer <eakammer@google.com> | 2021-07-21 11:00:20 -0400 |
|---|---|---|
| committer | Liz Kammer <eakammer@google.com> | 2021-07-21 11:00:20 -0400 |
| commit | 91cfe1cf271598add77e9668f68c49d62f37da18 (patch) | |
| tree | 30a921d21289dfbca5dd51e71203d6707e7d1d41 /platforms | |
| parent | b8891793d6ea2d98eb6d1ade9f7e58a5be5664d9 (diff) | |
| download | bazel-91cfe1cf271598add77e9668f68c49d62f37da18.tar.gz | |
Make //build/bazel/platforms/os:bionic work
aliases cannot currently handle constraint_values, so wrap the
appropriate constraint_values into config_settings so that
selects.match_any works.
Test: locally change file to use //build/bazel/platforms/os:bionic and
verify it works
Change-Id: Icfca2f085c20a35b0c247a3a4467b9ad462f9f58
Diffstat (limited to 'platforms')
| -rw-r--r-- | platforms/os/BUILD | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/platforms/os/BUILD b/platforms/os/BUILD index 5570f162..ceeeffda 100644 --- a/platforms/os/BUILD +++ b/platforms/os/BUILD @@ -13,6 +13,13 @@ constraint_value( constraint_setting = "@platforms//os:os", ) +config_setting( + name = "android_config_setting", + constraint_values = [ + ":android", + ], +) + # Alias to the local_jdk's toolchain constraint to make local_jdk resolve # correctly with --tool_java_runtime_version=local_jdk and the checked-in JDK. alias( @@ -30,6 +37,13 @@ constraint_value( constraint_setting = "@platforms//os:os", ) +config_setting( + name = "linux_bionic_config_setting", + constraint_values = [ + ":linux_bionic", + ], +) + constraint_value( name = "windows", constraint_setting = "@platforms//os:os", @@ -48,7 +62,7 @@ constraint_value( selects.config_setting_group( name = "bionic", match_any = [ - ":android", - ":linux_bionic", + ":android_config_setting", + ":linux_bionic_config_setting", ], ) |