diff options
author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-06-07 21:25:59 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-06-07 21:25:59 +0000 |
commit | 9825551dbfea370f3aaf13611867e1d4f98a6eaa (patch) | |
tree | 9e917ea4686a48d676bf58ee9be850699c128113 | |
parent | b880578664c9d486b2bae51e540c8e6ff2af8017 (diff) | |
parent | 447b4a4bf032a550ada6621a33d6b1e188357eb2 (diff) | |
download | core-9825551dbfea370f3aaf13611867e1d4f98a6eaa.tar.gz |
Merge "libcutils_test: static libjsoncpp" into android12-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 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, |