aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-03-08 15:12:47 -0800
committerColin Cross <ccross@android.com>2022-03-08 15:12:47 -0800
commit1add6d66eb01f1b579a65b935e59d973d034adf8 (patch)
tree4aca2832f8eae48692a53915ddfd682e4bcc5a13
parent7380ba9a76821e0f3fb1fdb5cfbe03f3a834ce9b (diff)
downloadlibusb-1add6d66eb01f1b579a65b935e59d973d034adf8.tar.gz
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
-rw-r--r--Android.bp10
1 files changed, 1 insertions, 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",
],