diff options
| author | Colin Cross <ccross@android.com> | 2022-03-08 18:24:37 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2022-03-08 18:24:37 -0800 |
| commit | 3291096f9c4c5a25f94e1a6043384bee14e97fbb (patch) | |
| tree | 038ab12226fdeffe9183d3492e7ee1a7ace21519 | |
| parent | 879916155c7757ba3a77c880ab1e949e8c6ed74b (diff) | |
| download | libbcc-3291096f9c4c5a25f94e1a6043384bee14e97fbb.tar.gz | |
Tweak linux_glibc properties for musl builds in frameworks/compile
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: I152ce6879bfaa0720f9289579686aa5044f677d1
| -rw-r--r-- | bcinfo/Android.bp | 2 | ||||
| -rw-r--r-- | lib/Android.bp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bcinfo/Android.bp b/bcinfo/Android.bp index 95f7f0d..13c27cd 100644 --- a/bcinfo/Android.bp +++ b/bcinfo/Android.bp @@ -82,7 +82,7 @@ cc_library_shared { darwin: { shared_libs: ["libLLVM_android"], }, - linux_glibc: { + host_linux: { allow_undefined_symbols: true, }, host: { diff --git a/lib/Android.bp b/lib/Android.bp index 583afa0..7c53f60 100644 --- a/lib/Android.bp +++ b/lib/Android.bp @@ -63,7 +63,7 @@ cc_library { darwin: { shared_libs: ["libLLVM_android"], }, - linux_glibc: { + host_linux: { static_libs: ["libLLVMLinker"], allow_undefined_symbols: true, }, |