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

am: 5682e001e9

Change-Id: I3b01c3f65e7b05191b3867928a5e9d1b8f8cc1c8
This commit is contained in:
Richard Uhler 2017-02-24 11:17:14 +00:00 committed by android-build-merger
commit 0d461283ce

View file

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