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

libcutils_test: static libjsoncpp

Browse source 
The 32-bit variant of libjsoncpp is not always installed
on 64-bit devices, so it must always be statically included.

We should probably collapse libcutils_test with
libcutils_test_static in the future.

Bug: 285357054
Test: libcutils_test
Merged-In: Ic84901ce5af766338b2cab07c3cf10841ba9a150
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
This commit is contained in:
Steven Moreland 2023-06-06 17:52:39 +00:00
parent b880578664
commit 447b4a4bf0
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,