commit 3006ca9914fda3239ba67ba1fd8d492bec15053b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 08 20:35:47 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 08 20:35:47 2023 +0000
tree d5a3be68cffae4bce83eebb4220f068216006d6a
parent cb213f5da9f76047b84b8999b074dac82e2f8f68
parent 767bf5d06a1753d07a7b32500de1acff859efc1f

Merge "Snap for 10281684 from 2520bfb0d94b051a8aa391aba1d89a37a75af405 to android13-tests-release" into android13-tests-release

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index c8bfb01..40c478a 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -303,11 +303,14 @@
     ],
 }
 
+always_static_test_libraries = [
+    "libjsoncpp",
+]
+
 test_libraries = [
     "libcutils",
     "liblog",
     "libbase",
-    "libjsoncpp",
     "libprocessgroup",
     "libcgrouprc",
 ]
@@ -318,6 +321,7 @@
     defaults: ["libcutils_test_default"],
     host_supported: true,
     shared_libs: test_libraries,
+    static_libs: always_static_test_libraries,
     require_root: true,
 }
 
@@ -327,7 +331,7 @@
     static_libs: [
         "libc",
         "libcgrouprc_format",
-    ] + test_libraries,
+    ] + test_libraries + always_static_test_libraries,
     stl: "libc++_static",
     require_root: true,