diff options
author | Colin Cross <ccross@android.com> | 2022-03-08 15:12:48 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2022-03-08 15:12:48 -0800 |
commit | f385b9af8f4c3358e5e15d6dbfdd1889c0360257 (patch) | |
tree | 9d2acf76969e2ee04aa7b8767a79f1601884eea7 | |
parent | cf2575b23867e6985232a140c9c14d764b62b6d7 (diff) | |
download | android_log-sys-f385b9af8f4c3358e5e15d6dbfdd1889c0360257.tar.gz |
Tweak linux_glibc properties for musl builds in external/rust/crates/android_log-sys
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: Ic692b12ec4ee369f70ed238ed727f1d7090f414c
-rw-r--r-- | Android.bp | 4 | ||||
-rw-r--r-- | cargo2android_glibc.bp | 6 |
2 files changed, 9 insertions, 1 deletions
@@ -62,5 +62,9 @@ rust_library { // liblog is not added as a dependency for linux_glibc target enabled: false, }, + linux_musl: { + // liblog is not added as a dependency for linux_musl target + enabled: false, + }, }, } diff --git a/cargo2android_glibc.bp b/cargo2android_glibc.bp index f4d25cf..7d62503 100644 --- a/cargo2android_glibc.bp +++ b/cargo2android_glibc.bp @@ -3,4 +3,8 @@ target: { // liblog is not added as a dependency for linux_glibc target enabled: false, }, -}
\ No newline at end of file + linux_musl: { + // liblog is not added as a dependency for linux_musl target + enabled: false, + }, +} |