commit 021e27f8b2c8af153d1efeaedd86211504d225a8
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 15 19:58:09 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Fri Apr 15 19:58:09 2022 -0700
tree 4aca2832f8eae48692a53915ddfd682e4bcc5a13
parent 1f438eed740c38fa81fc62d6a8f051b6bb58001f
parent 400777577563b0ddee268e2bc4f29aab00ff9552

Merge 400777577563b0ddee268e2bc4f29aab00ff9552 on remote branch

Change-Id: I676fd0a31894f5dc407b78fef1aa0804563fe2f9

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",
             ],