diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-08 00:29:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-08 00:29:32 +0000 |
| commit | 203d050e41486d28da7b328a3a54380744cc85f2 (patch) | |
| tree | 622f3963663225fb563a4c163b7430abd145ffba | |
| parent | 34d2ae6aa52321cbd46978aff45f65da1d682be5 (diff) | |
| parent | 2d9d60a93db6276d2a3932a109c07987e8f6f4bf (diff) | |
| download | core-203d050e41486d28da7b328a3a54380744cc85f2.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: 2d9d60a93d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: I6ad0021cdcea70f85f59645b6a6eb86e291a7028
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 b135e57bc..0b5c1254e 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -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, |