diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-07 21:59:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-07 21:59:11 +0000 |
| commit | 0b3153f9c0663da43fda664ce282d2b0f14205d6 (patch) | |
| tree | 35ab5ef15a74d0fad898524fe2f32da1c92d0c74 | |
| parent | 11caad9d6c8ca8d849f3444857edb76bc3a91977 (diff) | |
| parent | 9825551dbfea370f3aaf13611867e1d4f98a6eaa (diff) | |
| download | core-0b3153f9c0663da43fda664ce282d2b0f14205d6.tar.gz | |
Merge "libcutils_test: static libjsoncpp" into android12-tests-dev am: 9825551dbf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2617475
Change-Id: I80baf972eba778b21195028782a2cf63fc7b85f0
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 68b21c6a0..b9e0bb7ee 100644 --- a/libcutils/Android.bp +++ b/libcutils/Android.bp @@ -302,11 +302,14 @@ cc_defaults { ], } +always_static_test_libraries = [ + "libjsoncpp", +] + test_libraries = [ "libcutils", "liblog", "libbase", - "libjsoncpp", "libprocessgroup", "libcgrouprc", ] @@ -317,6 +320,7 @@ cc_test { defaults: ["libcutils_test_default"], host_supported: true, shared_libs: test_libraries, + static_libs: always_static_test_libraries, require_root: true, } @@ -326,7 +330,7 @@ cc_defaults { static_libs: [ "libc", "libcgrouprc_format", - ] + test_libraries, + ] + test_libraries + always_static_test_libraries, stl: "libc++_static", require_root: true, |