From 1add6d66eb01f1b579a65b935e59d973d034adf8 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 8 Mar 2022 15:12:47 -0800 Subject: Tweak linux_glibc properties for musl builds in external/libusb 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: Ifc78a0294bd34146aa352064e071c8a7e0322e42 --- Android.bp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Android.bp b/Android.bp index de529f2..4befb96 100644 --- a/Android.bp +++ b/Android.bp @@ -105,15 +105,7 @@ cc_library { ], }, - linux_glibc: { - local_include_dirs: [ - "linux", - ], - - cflags: ["-Werror"], - }, - - linux_bionic: { + host_linux: { local_include_dirs: [ "linux", ], -- cgit v1.2.3