Merge "Merge "Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf" into android12L-tests-dev am: 50cac03f37" into android13-tests-dev am: 2520bfb0d9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475 Change-Id: I811591f1eec3ea5b17469b6e2c7b9e3b706d1627 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
1400b2dcaa
1 changed files with 6 additions and 2 deletions
|
@ -303,11 +303,14 @@ cc_defaults {
|
|||
],
|
||||
}
|
||||
|
||||
always_static_test_libraries = [
|
||||
"libjsoncpp",
|
||||
]
|
||||
|
||||
test_libraries = [
|
||||
"libcutils",
|
||||
"liblog",
|
||||
"libbase",
|
||||
"libjsoncpp",
|
||||
"libprocessgroup",
|
||||
"libcgrouprc",
|
||||
]
|
||||
|
@ -318,6 +321,7 @@ cc_test {
|
|||
defaults: ["libcutils_test_default"],
|
||||
host_supported: true,
|
||||
shared_libs: test_libraries,
|
||||
static_libs: always_static_test_libraries,
|
||||
require_root: true,
|
||||
}
|
||||
|
||||
|
@ -327,7 +331,7 @@ cc_defaults {
|
|||
static_libs: [
|
||||
"libc",
|
||||
"libcgrouprc_format",
|
||||
] + test_libraries,
|
||||
] + test_libraries + always_static_test_libraries,
|
||||
stl: "libc++_static",
|
||||
require_root: true,
|
||||
|
||||
|
|
Loading…
Reference in a new issue