diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-18 22:56:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-18 22:56:19 +0000 |
| commit | abb3521abec06c7e121904fea9e1a69db73e43ed (patch) | |
| tree | 15ab92b3769f73a206019df088ca79565cc03d03 /libutils | |
| parent | 38ec7354adf43fb378b474eaa6f36d4a15dc402a (diff) | |
| parent | f973417005cc4190c5a25c20653035cd4220d6a4 (diff) | |
| download | system_core-abb3521abec06c7e121904fea9e1a69db73e43ed.tar.gz system_core-abb3521abec06c7e121904fea9e1a69db73e43ed.tar.bz2 system_core-abb3521abec06c7e121904fea9e1a69db73e43ed.zip | |
Merge "Use target.linux for all linux kernel based targets" am: ab62265fa1
am: f973417005
Change-Id: I6bba9b0849075fe0703032d2c8f258b5ea86547f
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 { target: { android: { srcs: [ - "Looper.cpp", - "ProcessCallStack.cpp", "Trace.cpp", ], @@ -115,6 +113,12 @@ cc_library { misc_undefined: ["integer"], }, }, + linux: { + srcs: [ + "Looper.cpp", + "ProcessCallStack.cpp", + ], + }, host: { cflags: ["-DLIBUTILS_NATIVE=1"], @@ -124,18 +128,8 @@ cc_library { }, }, - linux_glibc: { - srcs: [ - "Looper.cpp", - "ProcessCallStack.cpp", - ], - }, linux_bionic: { enabled: true, - srcs: [ - "Looper.cpp", - "ProcessCallStack.cpp", - ], }, 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 { target: { android: { srcs: [ - "Looper_test.cpp", - "RefBase_test.cpp", "SystemClock_test.cpp", ], shared_libs: [ @@ -46,7 +44,7 @@ cc_test { "libbase", ], }, - linux_glibc: { + linux: { srcs: [ "Looper_test.cpp", "RefBase_test.cpp", |