summaryrefslogtreecommitdiffstats
path: root/libutils
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2017-10-03 03:03:52 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-03 03:03:52 +0000
commit348a08246992bcb5c9703873f3a51c9c744696a5 (patch)
tree698ba5948cf271178a2d4ab0641e47c1f2041536 /libutils
parent0a3b1d31ab7fed4b63fef9cc10d54d05de6bcecd (diff)
parent7b3d4da91a064ddc0973b1c03c1d6c68b76b9952 (diff)
downloadsystem_core-348a08246992bcb5c9703873f3a51c9c744696a5.tar.gz
system_core-348a08246992bcb5c9703873f3a51c9c744696a5.tar.bz2
system_core-348a08246992bcb5c9703873f3a51c9c744696a5.zip
Merge changes from topic "linux_glibc"
am: 7b3d4da91a Change-Id: I1cb69992882db5a265234ac808d408f1f136f0e5
Diffstat (limited to 'libutils')
-rw-r--r--libutils/Android.bp2
-rw-r--r--libutils/tests/Android.bp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libutils/Android.bp b/libutils/Android.bp
index adcde819c..b7e397e43 100644
--- a/libutils/Android.bp
+++ b/libutils/Android.bp
@@ -119,7 +119,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",