diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-08 00:32:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-08 00:32:12 +0000 |
| commit | 4e9b58603e3b2d6ae32329a351df569ad18125c5 (patch) | |
| tree | 040473ebe458d3c16754fee4a7979292d6fd6f3d | |
| parent | a0caaae440f96205ebfc436451c68851972c91f7 (diff) | |
| parent | 1f80c8bfbfc5564aef15f91aceeb1a7ef70a11d0 (diff) | |
| download | core-4e9b58603e3b2d6ae32329a351df569ad18125c5.tar.gz | |
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 am: 1f80c8bfbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: I82aeaa4f7faf1b235ab3c473a503488a85fc281b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libcutils/Android.bp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libcutils/Android.bp b/libcutils/Android.bp index c8bfb0194..40c478ac2 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -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, |