diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-10-03 14:17:31 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-10-16 20:55:39 -0700 |
| commit | bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e (patch) | |
| tree | 331faf41713b3286f19eb651ef6cb882562b1732 /libutils | |
| parent | 06254de12a9a12c5d0a7732d2a40cc3a10754b57 (diff) | |
| download | system_core-bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e.tar.gz system_core-bdddcab3bd0c92d12793d4e1bc7252443bcd0e6e.tar.bz2 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 '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 30e6b49a8..3589e6f12 100644 --- a/libutils/Android.bp +++ b/libutils/Android.bp @@ -93,8 +93,6 @@ cc_library { target: { android: { srcs: [ - "Looper.cpp", - "ProcessCallStack.cpp", "Trace.cpp", ], @@ -112,6 +110,12 @@ cc_library { misc_undefined: ["integer"], }, }, + linux: { + srcs: [ + "Looper.cpp", + "ProcessCallStack.cpp", + ], + }, host: { cflags: ["-DLIBUTILS_NATIVE=1"], @@ -121,18 +125,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", |