commit ec8519e953f494561dd1e24c51cba2d8556bca58
author Treehugger Robot <treehugger-gerrit@google.com> Wed Mar 30 00:09:01 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 30 00:09:01 2022 +0000
tree 59fea0585c8fc159a34d63680994abb061b85729
parent c015f7f96db46e5c5345a5af902b3d2c9b8ee195
parent 10bbb018237b12fa78c968d447fce52593a8d07a

Merge "Tweak linux_glibc properties for musl builds in system/core"

libdiskconfig/Android.bp

diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp
index a3d643e..f523d4e 100644
--- a/libdiskconfig/Android.bp
+++ b/libdiskconfig/Android.bp
@@ -27,12 +27,8 @@
         darwin: {
             enabled: false,
         },
-        linux_glibc: {
+        host_linux: {
             cflags: [
-                "-O2",
-                "-g",
-                "-W",
-                "-Wall",
                 "-D_LARGEFILE64_SOURCE",
             ],
         },

libutils/Android.bp

diff --git a/libutils/Android.bp b/libutils/Android.bp
index 58af8e4..a9bd7d9 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -48,13 +48,11 @@
             header_libs: ["libbacktrace_headers"],
             export_header_lib_headers: ["libbacktrace_headers"],
         },
-        linux_glibc: {
+        host_linux: {
             header_libs: ["libbacktrace_headers"],
             export_header_lib_headers: ["libbacktrace_headers"],
         },
         linux_bionic: {
-            header_libs: ["libbacktrace_headers"],
-            export_header_lib_headers: ["libbacktrace_headers"],
             enabled: true,
         },
         windows: {