summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorDan Willemsen2017-10-03 16:17:31 -0500
committerDan Willemsen2017-10-16 22:55:39 -0500
commitbdddcab3bd0c92d12793d4e1bc7252443bcd0e6e (patch)
tree331faf41713b3286f19eb651ef6cb882562b1732 /base
parent06254de12a9a12c5d0a7732d2a40cc3a10754b57 (diff)
downloadplatform-system-core-bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e.tar.gz
platform-system-core-bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e.tar.xz
platform-system-core-bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e.zip
Use target.linux for all linux kernel based targets
Now in Android.bp files, target.linux applies to all targets running a linux kernel (android, linux_glibc, linux_bionic). So common flags/sources/etc can be combined instead of copying them to each target. Test: m Change-Id: If7ad138ea1c540c160731f86b6ccc0daa5c69b83
Diffstat (limited to 'base')
-rw-r--r--base/Android.bp23
1 files changed, 6 insertions, 17 deletions
diff --git a/base/Android.bp b/base/Android.bp
index 0fd00ea5d..f4a841107 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -64,37 +64,29 @@ cc_library {
64 target: { 64 target: {
65 android: { 65 android: {
66 srcs: [ 66 srcs: [
67 "errors_unix.cpp",
68 "properties.cpp", 67 "properties.cpp",
69 "chrono_utils.cpp",
70 ], 68 ],
71 cppflags: ["-Wexit-time-destructors"],
72 sanitize: { 69 sanitize: {
73 misc_undefined: ["integer"], 70 misc_undefined: ["integer"],
74 }, 71 },
75 72
76 }, 73 },
77 darwin: { 74 linux: {
78 srcs: [ 75 srcs: [
79 "chrono_utils.cpp", 76 "chrono_utils.cpp",
80 "errors_unix.cpp", 77 "errors_unix.cpp",
81 ], 78 ],
82 cppflags: ["-Wexit-time-destructors"], 79 cppflags: ["-Wexit-time-destructors"],
83 }, 80 },
84 linux_bionic: { 81 darwin: {
85 srcs: [ 82 srcs: [
86 "chrono_utils.cpp", 83 "chrono_utils.cpp",
87 "errors_unix.cpp", 84 "errors_unix.cpp",
88 ], 85 ],
89 cppflags: ["-Wexit-time-destructors"], 86 cppflags: ["-Wexit-time-destructors"],
90 enabled: true,
91 }, 87 },
92 linux_glibc: { 88 linux_bionic: {
93 srcs: [ 89 enabled: true,
94 "chrono_utils.cpp",
95 "errors_unix.cpp",
96 ],
97 cppflags: ["-Wexit-time-destructors"],
98 }, 90 },
99 windows: { 91 windows: {
100 srcs: [ 92 srcs: [
@@ -127,15 +119,12 @@ cc_test {
127 ], 119 ],
128 target: { 120 target: {
129 android: { 121 android: {
130 srcs: [ 122 srcs: ["properties_test.cpp"],
131 "chrono_utils_test.cpp",
132 "properties_test.cpp"
133 ],
134 sanitize: { 123 sanitize: {
135 misc_undefined: ["integer"], 124 misc_undefined: ["integer"],
136 }, 125 },
137 }, 126 },
138 linux_glibc: { 127 linux: {
139 srcs: ["chrono_utils_test.cpp"], 128 srcs: ["chrono_utils_test.cpp"],
140 }, 129 },
141 windows: { 130 windows: {