Merge "Revert "Make libutils test compile on the host"" am: 16f4fb9c4e am: 5682e001e9

am: 0d461283ce

Change-Id: I82132fc1e9eda421ed44a65029d389fdde67d5e8
This commit is contained in:
Richard Uhler 2017-02-24 11:20:20 +00:00 committed by android-build-merger
commit 2aa94cfaf9
1 changed files with 16 additions and 26 deletions

View File

@ -18,43 +18,33 @@
cc_test {
name: "libutils_tests",
host_supported: true,
srcs: [
"BlobCache_test.cpp",
"BitSet_test.cpp",
"Looper_test.cpp",
"LruCache_test.cpp",
"RefBase_test.cpp",
"String8_test.cpp",
"StrongPointer_test.cpp",
"SystemClock_test.cpp",
"Unicode_test.cpp",
"Vector_test.cpp",
],
target: {
android: {
srcs: [
"BlobCache_test.cpp",
"SystemClock_test.cpp",
],
shared_libs: [
"libz",
"liblog",
"libcutils",
"libutils",
],
},
host: {
static_libs: [
"libutils",
"liblog",
],
},
},
cflags: [
"-Wall",
"-Wextra",
"-Werror",
shared_libs: [
"libz",
"liblog",
"libcutils",
"libutils",
],
}
cc_test_host {
name: "libutils_tests_host",
srcs: ["Vector_test.cpp"],
static_libs: [
"libutils",
"liblog",
],
}