From 81e38489d3badb76e37732c0661e7f3362883c97 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 8 Mar 2022 15:12:46 -0800 Subject: Tweak linux_glibc properties for musl builds in external/dng_sdk 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: Ie70b17456bd4f20eddb0be44a56f6caa661e265e --- Android.bp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.bp b/Android.bp index 0681e93..3f2509e 100644 --- a/Android.bp +++ b/Android.bp @@ -156,7 +156,7 @@ cc_library{ ], target: { - linux_glibc: { + host_linux: { static_libs: ["libcompiler_rt-extras"], }, darwin: { -- cgit v1.2.3