Merge changes from topic "linux_glibc" am: 7b3d4da91a
am: 348a082469
Change-Id: Ia203b8b7bf807385b90232fedf91cef80f040279
diff --git a/base/Android.bp b/base/Android.bp
index da262d2..0fd00ea 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -89,7 +89,7 @@
cppflags: ["-Wexit-time-destructors"],
enabled: true,
},
- linux: {
+ linux_glibc: {
srcs: [
"chrono_utils.cpp",
"errors_unix.cpp",
@@ -135,7 +135,7 @@
misc_undefined: ["integer"],
},
},
- linux: {
+ linux_glibc: {
srcs: ["chrono_utils_test.cpp"],
},
windows: {
diff --git a/libbacktrace/Android.bp b/libbacktrace/Android.bp
index 69d7b6d..2f20684 100644
--- a/libbacktrace/Android.bp
+++ b/libbacktrace/Android.bp
@@ -83,7 +83,7 @@
darwin: {
enabled: true,
},
- linux: {
+ linux_glibc: {
srcs: libbacktrace_sources,
shared_libs: [
@@ -135,7 +135,7 @@
srcs: ["backtrace_testlib.cpp"],
target: {
- linux: {
+ linux_glibc: {
shared_libs: [
"libunwind",
"libunwindstack",
@@ -231,7 +231,7 @@
"libutils",
],
},
- linux: {
+ linux_glibc: {
host_ldlibs: [
"-lncurses",
],
diff --git a/libdiskconfig/Android.bp b/libdiskconfig/Android.bp
index 23a5c79..b92f086 100644
--- a/libdiskconfig/Android.bp
+++ b/libdiskconfig/Android.bp
@@ -23,7 +23,7 @@
darwin: {
enabled: false,
},
- linux: {
+ linux_glibc: {
cflags: [
"-O2",
"-g",
diff --git a/libutils/Android.bp b/libutils/Android.bp
index adcde81..b7e397e 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -119,7 +119,7 @@
},
},
- linux: {
+ linux_glibc: {
srcs: [
"Looper.cpp",
"ProcessCallStack.cpp",
diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp
index 3fadef4..6911fc5 100644
--- a/libutils/tests/Android.bp
+++ b/libutils/tests/Android.bp
@@ -46,7 +46,7 @@
"libbase",
],
},
- linux: {
+ linux_glibc: {
srcs: [
"Looper_test.cpp",
"RefBase_test.cpp",