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

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
Change-Id: Ic84901ce5af766338b2cab07c3cf10841ba9a150
This commit is contained in:
Steven Moreland 2023-06-06 17:52:39 +00:00
parent 9bf90f14d4
commit 40b59a61fc
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

@ -286,11 +286,14 @@ cc_defaults {
],
}
always_static_test_libraries = [
"libjsoncpp",
]
test_libraries = [
"libcutils",
"liblog",
"libbase",
"libjsoncpp",
"libprocessgroup",
"libcgrouprc",
]
@ -301,6 +304,7 @@ cc_test {
defaults: ["libcutils_test_default"],
host_supported: true,
shared_libs: test_libraries,
static_libs: always_static_test_libraries,
require_root: true,
}
@ -310,7 +314,7 @@ cc_defaults {
static_libs: [
"libc",
"libcgrouprc_format",
] + test_libraries,
] + test_libraries + always_static_test_libraries,
stl: "libc++_static",
require_root: true,