tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Move SingletonTest back to libutils_test"

Browse source
This commit is contained in:
Yo Chiang 2020-07-13 03:49:17 +00:00 committed by Gerrit Code Review
commit 9a57044ab3
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libutils/Android.bp
View file

@ -248,6 +248,7 @@ cc_test {
"LruCache_test.cpp",
"Mutex_test.cpp",
"SharedBuffer_test.cpp",
"Singleton_test.cpp",
"String8_test.cpp",
"String16_test.cpp",
"StrongPointer_test.cpp",
@ -284,6 +285,11 @@ cc_test {
},
},
data_libs: [
"libutils_test_singleton1",
"libutils_test_singleton2",
],
cflags: [
"-Wall",
"-Wextra",
@ -294,29 +300,10 @@ cc_test {
test_suites: ["device-tests"],
}
// TODO: the test infrastructure isn't yet capable of running this,
// so it's broken out into its own test so that the main libutils_tests
// can be in presubmit even if this can't.
cc_test {
name: "libutils_singleton_test",
srcs: ["Singleton_test.cpp"],
cflags: [
"-Wall",
"-Werror",
],
shared_libs: ["libbase"],
required: [
":libutils_test_singleton1",
":libutils_test_singleton2",
],
}
cc_test_library {
name: "libutils_test_singleton1",
host_supported: true,
relative_install_path: "libutils_test",
installable: false,
srcs: ["Singleton_test1.cpp"],
cflags: [
"-Wall",
@ -327,7 +314,7 @@ cc_test_library {
cc_test_library {
name: "libutils_test_singleton2",
host_supported: true,
relative_install_path: "libutils_test",
installable: false,
srcs: ["Singleton_test2.cpp"],
cflags: [
"-Wall",