summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Willemsen2017-10-02 12:38:16 -0500
committerDan Willemsen2017-10-02 12:44:29 -0500
commit48529337077a2fad36a7cba0a26083694bff3537 (patch)
tree7ee83a477c711abf16ce00de72adfa2270277290
parentcd58088ccfc1a3315bed181c0c1b7cab3e71176f (diff)
downloadplatform-system-core-48529337077a2fad36a7cba0a26083694bff3537.tar.gz
platform-system-core-48529337077a2fad36a7cba0a26083694bff3537.tar.xz
platform-system-core-48529337077a2fad36a7cba0a26083694bff3537.zip
Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]
In the future, target.linux will apply to all targets running a linux kernel (android, linux_glibc, linux_bionic). So move all current users to the specific linux_glibc. There will be another cleanup pass later that will move some instances back to target.linux if the properties should be shared with target.android and target.linux_bionic, but target.linux needs to be removed first. Test: out/soong/build.ninja identical before/after Change-Id: I72ef34689c60ce547cab2898e354b027e335f6a1 Exempt-From-Owner-Approval: build system cleanup
-rw-r--r--base/Android.bp4
-rw-r--r--libbacktrace/Android.bp6
-rw-r--r--libdiskconfig/Android.bp2
-rw-r--r--libutils/Android.bp2
-rw-r--r--libutils/tests/Android.bp2
5 files changed, 8 insertions, 8 deletions
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 {
89 cppflags: ["-Wexit-time-destructors"], 89 cppflags: ["-Wexit-time-destructors"],
90 enabled: true, 90 enabled: true,
91 }, 91 },
92 linux: { 92 linux_glibc: {
93 srcs: [ 93 srcs: [
94 "chrono_utils.cpp", 94 "chrono_utils.cpp",
95 "errors_unix.cpp", 95 "errors_unix.cpp",
@@ -135,7 +135,7 @@ cc_test {
135 misc_undefined: ["integer"], 135 misc_undefined: ["integer"],
136 }, 136 },
137 }, 137 },
138 linux: { 138 linux_glibc: {
139 srcs: ["chrono_utils_test.cpp"], 139 srcs: ["chrono_utils_test.cpp"],
140 }, 140 },
141 windows: { 141 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 {
83 darwin: { 83 darwin: {
84 enabled: true, 84 enabled: true,
85 }, 85 },
86 linux: { 86 linux_glibc: {
87 srcs: libbacktrace_sources, 87 srcs: libbacktrace_sources,
88 88
89 shared_libs: [ 89 shared_libs: [
@@ -135,7 +135,7 @@ cc_library_shared {
135 srcs: ["backtrace_testlib.cpp"], 135 srcs: ["backtrace_testlib.cpp"],
136 136
137 target: { 137 target: {
138 linux: { 138 linux_glibc: {
139 shared_libs: [ 139 shared_libs: [
140 "libunwind", 140 "libunwind",
141 "libunwindstack", 141 "libunwindstack",
@@ -231,7 +231,7 @@ cc_test {
231 "libutils", 231 "libutils",
232 ], 232 ],
233 }, 233 },
234 linux: { 234 linux_glibc: {
235 host_ldlibs: [ 235 host_ldlibs: [
236 "-lncurses", 236 "-lncurses",
237 ], 237 ],
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 {
23 darwin: { 23 darwin: {
24 enabled: false, 24 enabled: false,
25 }, 25 },
26 linux: { 26 linux_glibc: {
27 cflags: [ 27 cflags: [
28 "-O2", 28 "-O2",
29 "-g", 29 "-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 {
121 }, 121 },
122 }, 122 },
123 123
124 linux: { 124 linux_glibc: {
125 srcs: [ 125 srcs: [
126 "Looper.cpp", 126 "Looper.cpp",
127 "ProcessCallStack.cpp", 127 "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 {
46 "libbase", 46 "libbase",
47 ], 47 ],
48 }, 48 },
49 linux: { 49 linux_glibc: {
50 srcs: [ 50 srcs: [
51 "Looper_test.cpp", 51 "Looper_test.cpp",
52 "RefBase_test.cpp", 52 "RefBase_test.cpp",