From 9236473cca084bae649030c0451a94b050906d78 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 29 Mar 2022 20:46:18 -0700 Subject: Tweak linux_glibc properties for musl builds in build/bazel For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: I79432ab23572fe66f783dfea60f8b9524cc7a0d0 --- examples/soong_config_variables/Android.bp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/soong_config_variables/Android.bp b/examples/soong_config_variables/Android.bp index 3faf7577..8994f28e 100644 --- a/examples/soong_config_variables/Android.bp +++ b/examples/soong_config_variables/Android.bp @@ -81,6 +81,9 @@ fake_library_linking_strategy_cc_defaults { linux_glibc: { enabled: false, }, + linux_musl: { + enabled: false, + }, linux_bionic: { enabled: false, }, -- cgit v1.2.3