diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-06 20:21:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-07-06 20:21:33 +0000 |
| commit | 0eb1b19cebad5731f4ec1ce896b6d4e181530b30 (patch) | |
| tree | 9e917ea4686a48d676bf58ee9be850699c128113 | |
| parent | aed53ce409da945cd77700c3b85dd13751ee3817 (diff) | |
| parent | 855ad395da4860612761eeb6a98adaf57c51d6da (diff) | |
| download | core-0eb1b19cebad5731f4ec1ce896b6d4e181530b30.tar.gz | |
Merge "Snap for 10445396 from 9825551dbfea370f3aaf13611867e1d4f98a6eaa to android12-tests-release" into android12-tests-releaseandroid-vts-12.0_r9android-vts-12.0_r11android-vts-12.0_r10android-cts-12.0_r9android-cts-12.0_r11android-cts-12.0_r10
| -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, |