diff --git a/base/Android.bp b/base/Android.bp index da262d20d..0fd00ea5d 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 69d7b6db4..2f2068407 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 23a5c79d0..b92f0863d 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 038fd73f9..30e6b49a8 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 3fadef44d..6911fc51b 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",