diff --git a/base/Android.bp b/base/Android.bp
index da262d20d0060ca93e5ca68e8f573581f7f53b33..0fd00ea5d3e9866f8937ab0a4c0f45cfc0e31ecf 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -89,7 +89,7 @@ cc_library {
             cppflags: ["-Wexit-time-destructors"],
             enabled: true,
         },
-        linux: {
+        linux_glibc: {
             srcs: [
                 "chrono_utils.cpp",
                 "errors_unix.cpp",
@@ -135,7 +135,7 @@ cc_test {
                 misc_undefined: ["integer"],
             },
         },
-        linux: {
+        linux_glibc: {
             srcs: ["chrono_utils_test.cpp"],
         },
         windows: {
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 69d7b6db44035dce263adb1c8c612a8743554a31..2f2068407b11d467cef4969ddef739359477596e 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -83,7 +83,7 @@ cc_library {
         darwin: {
             enabled: true,
         },
-        linux: {
+        linux_glibc: {
             srcs: libbacktrace_sources,
 
             shared_libs: [
@@ -135,7 +135,7 @@ cc_library_shared {
     srcs: ["backtrace_testlib.cpp"],
 
     target: {
-        linux: {
+        linux_glibc: {
             shared_libs: [
                 "libunwind",
                 "libunwindstack",
@@ -231,7 +231,7 @@ cc_test {
                 "libutils",
             ],
         },
-        linux: {
+        linux_glibc: {
             host_ldlibs: [
                 "-lncurses",
             ],
diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp
index 23a5c79d0d1cc19ddfabf013388839d0854980aa..b92f0863d9a24d86a40a62948da66f7ef086feb3 100644
--- a/libdiskconfig/Android.bp
+++ b/libdiskconfig/Android.bp
@@ -23,7 +23,7 @@ cc_library {
         darwin: {
             enabled: false,
         },
-        linux: {
+        linux_glibc: {
             cflags: [
                 "-O2",
                 "-g",
diff --git a/libutils/Android.bp b/libutils/Android.bp
index 038fd73f9e7d67e29d7374465e069394a7851493..30e6b49a8eb03e356dd6579171fcf04e5843c6af 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -121,7 +121,7 @@ cc_library {
             },
         },
 
-        linux: {
+        linux_glibc: {
             srcs: [
                 "Looper.cpp",
                 "ProcessCallStack.cpp",
diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
index 3fadef44dbe52f85ebddb21a245e6b12950cfecc..6911fc51b26bc103232295bab2c25671cde1c4bb 100644
--- a/libutils/tests/Android.bp
+++ b/libutils/tests/Android.bp
@@ -46,7 +46,7 @@ cc_test {
                 "libbase",
             ],
         },
-        linux: {
+        linux_glibc: {
             srcs: [
                 "Looper_test.cpp",
                 "RefBase_test.cpp",