diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-07 22:18:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-07 22:18:20 +0000 |
| commit | 2520bfb0d94b051a8aa391aba1d89a37a75af405 (patch) | |
| tree | d5a3be68cffae4bce83eebb4220f068216006d6a | |
| parent | 0412ff9c1e3e10677db888ab3b4f5a964ff83613 (diff) | |
| parent | b30ffaea193b0ce39dea03d41b6e7816ac5e34eb (diff) | |
| download | core-2520bfb0d94b051a8aa391aba1d89a37a75af405.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
| -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, |