ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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 am: 1400b2dcaa

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475

Change-Id: I19a7e0ff5191ea2a11f4ee1bb3dd0f75388d2b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker 2023-06-07 23:48:06 +00:00
commit 2d9d60a93d
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libcutils/Android.bp
View file

@ -303,11 +303,14 @@ cc_defaults {
], ],
} }
always_static_test_libraries = [
"libjsoncpp",
]
test_libraries = [ test_libraries = [
"libcutils", "libcutils",
"liblog", "liblog",
"libbase", "libbase",
"libjsoncpp",
"libprocessgroup", "libprocessgroup",
"libcgrouprc", "libcgrouprc",
] ]
@ -318,6 +321,7 @@ cc_test {
defaults: ["libcutils_test_default"], defaults: ["libcutils_test_default"],
host_supported: true, host_supported: true,
shared_libs: test_libraries, shared_libs: test_libraries,
static_libs: always_static_test_libraries,
require_root: true, require_root: true,
} }
@ -327,7 +331,7 @@ cc_defaults {
static_libs: [ static_libs: [
"libc", "libc",
"libcgrouprc_format", "libcgrouprc_format",
] + test_libraries, ] + test_libraries + always_static_test_libraries,
stl: "libc++_static", stl: "libc++_static",
require_root: true, require_root: true,