commit 5f77e509fc13dc329040a948b4f34900a2a4740e
author Colin Cross <ccross@android.com> Tue Mar 15 23:32:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 15 23:32:09 2022 +0000
tree 4aca2832f8eae48692a53915ddfd682e4bcc5a13
parent 895f7d43b4858db961083cbbf783b9f4378586e5
parent 5304cf842bc939bf265e66def73bb62e7f93526e

Merge "Tweak linux_glibc properties for musl builds in external/libusb" am: 596772ba2a am: 87c8958af7 am: 499ca85135 am: 5304cf842b

Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/2018607

Change-Id: I97f3bb06876d25386f278b9de756a27631619a4b

Android.bp

diff --git a/Android.bp b/Android.bp
index de529f2..4befb96 100644
--- a/Android.bp
+++ b/Android.bp
@@ -105,15 +105,7 @@
             ],
         },
 
-        linux_glibc: {
-            local_include_dirs: [
-                "linux",
-            ],
-
-            cflags: ["-Werror"],
-        },
-
-        linux_bionic: {
+        host_linux: {
             local_include_dirs: [
                 "linux",
             ],