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

Merge "libcutils_test: static libjsoncpp" into android12-tests-dev

Browse source
This commit is contained in:
Treehugger Robot 2023-06-07 21:25:59 +00:00 • committed by Gerrit Code Review
commit 9825551dbf
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

@ -302,11 +302,14 @@ cc_defaults {
], ],
} }
always_static_test_libraries = [
"libjsoncpp",
]
test_libraries = [ test_libraries = [
"libcutils", "libcutils",
"liblog", "liblog",
"libbase", "libbase",
"libjsoncpp",
"libprocessgroup", "libprocessgroup",
"libcgrouprc", "libcgrouprc",
] ]
@ -317,6 +320,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,
} }
@ -326,7 +330,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,