diff options
author | Dan Willemsen | 2017-10-18 17:50:48 -0500 |
---|---|---|
committer | android-build-merger | 2017-10-18 17:50:48 -0500 |
commit | f973417005cc4190c5a25c20653035cd4220d6a4 (patch) | |
tree | 180255dec4f610bf80baad87e11306d6163da0b5 /libutils | |
parent | 57638bf967d085848626a0214d4e8e7d6b183962 (diff) | |
parent | ab62265fa13c5623ffc1f0859465c751e4ceebe8 (diff) | |
download | platform-system-core-f973417005cc4190c5a25c20653035cd4220d6a4.tar.gz platform-system-core-f973417005cc4190c5a25c20653035cd4220d6a4.tar.xz platform-system-core-f973417005cc4190c5a25c20653035cd4220d6a4.zip |
Merge "Use target.linux for all linux kernel based targets"
am: ab62265fa1
Change-Id: I11e4bd0dae56c350a9839f95b1e85bf30490701d
Diffstat (limited to 'libutils')
-rw-r--r-- | libutils/Android.bp | 18 | ||||
-rw-r--r-- | libutils/tests/Android.bp | 4 |
2 files changed, 7 insertions, 15 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp index 1bf5a64ff..b70845b75 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp | |||
@@ -97,8 +97,6 @@ cc_library { | |||
97 | target: { | 97 | target: { |
98 | android: { | 98 | android: { |
99 | srcs: [ | 99 | srcs: [ |
100 | "Looper.cpp", | ||
101 | "ProcessCallStack.cpp", | ||
102 | "Trace.cpp", | 100 | "Trace.cpp", |
103 | ], | 101 | ], |
104 | 102 | ||
@@ -115,6 +113,12 @@ cc_library { | |||
115 | misc_undefined: ["integer"], | 113 | misc_undefined: ["integer"], |
116 | }, | 114 | }, |
117 | }, | 115 | }, |
116 | linux: { | ||
117 | srcs: [ | ||
118 | "Looper.cpp", | ||
119 | "ProcessCallStack.cpp", | ||
120 | ], | ||
121 | }, | ||
118 | 122 | ||
119 | host: { | 123 | host: { |
120 | cflags: ["-DLIBUTILS_NATIVE=1"], | 124 | cflags: ["-DLIBUTILS_NATIVE=1"], |
@@ -124,18 +128,8 @@ cc_library { | |||
124 | }, | 128 | }, |
125 | }, | 129 | }, |
126 | 130 | ||
127 | linux_glibc: { | ||
128 | srcs: [ | ||
129 | "Looper.cpp", | ||
130 | "ProcessCallStack.cpp", | ||
131 | ], | ||
132 | }, | ||
133 | linux_bionic: { | 131 | linux_bionic: { |
134 | enabled: true, | 132 | enabled: true, |
135 | srcs: [ | ||
136 | "Looper.cpp", | ||
137 | "ProcessCallStack.cpp", | ||
138 | ], | ||
139 | }, | 133 | }, |
140 | 134 | ||
141 | darwin: { | 135 | darwin: { |
diff --git a/libutils/tests/Android.bp b/libutils/tests/Android.bp index 6911fc51b..a891fcae2 100644 --- a/libutils/tests/Android.bp +++ b/libutils/tests/Android.bp | |||
@@ -34,8 +34,6 @@ cc_test { | |||
34 | target: { | 34 | target: { |
35 | android: { | 35 | android: { |
36 | srcs: [ | 36 | srcs: [ |
37 | "Looper_test.cpp", | ||
38 | "RefBase_test.cpp", | ||
39 | "SystemClock_test.cpp", | 37 | "SystemClock_test.cpp", |
40 | ], | 38 | ], |
41 | shared_libs: [ | 39 | shared_libs: [ |
@@ -46,7 +44,7 @@ cc_test { | |||
46 | "libbase", | 44 | "libbase", |
47 | ], | 45 | ], |
48 | }, | 46 | }, |
49 | linux_glibc: { | 47 | linux: { |
50 | srcs: [ | 48 | srcs: [ |
51 | "Looper_test.cpp", | 49 | "Looper_test.cpp", |
52 | "RefBase_test.cpp", | 50 | "RefBase_test.cpp", |