commit 610ebc6ca09f9f42d6e496274a1b5d4cf9acd25f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 08 20:34:24 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 08 20:34:24 2023 +0000
tree 35ab5ef15a74d0fad898524fe2f32da1c92d0c74
parent cd9ca51c78fd4dfc0b09ead58e223dcde8c51012
parent 7c10a5b65a5e9a363029f27797fd50c1ed46d2ad

Merge "Snap for 10281467 from 50cac03f371590e89fbe3cc27292ad1f7e87ce00 to android12L-tests-release" into android12L-tests-release

libcutils/Android.bp

diff --git a/libcutils/Android.bp b/libcutils/Android.bp
index 68b21c6..b9e0bb7 100644
--- a/libcutils/Android.bp
+++ b/libcutils/Android.bp
@@ -302,11 +302,14 @@
     ],
 }
 
+always_static_test_libraries = [
+    "libjsoncpp",
+]
+
 test_libraries = [
     "libcutils",
     "liblog",
     "libbase",
-    "libjsoncpp",
     "libprocessgroup",
     "libcgrouprc",
 ]
@@ -317,6 +320,7 @@
     defaults: ["libcutils_test_default"],
     host_supported: true,
     shared_libs: test_libraries,
+    static_libs: always_static_test_libraries,
     require_root: true,
 }
 
@@ -326,7 +330,7 @@
     static_libs: [
         "libc",
         "libcgrouprc_format",
-    ] + test_libraries,
+    ] + test_libraries + always_static_test_libraries,
     stl: "libc++_static",
     require_root: true,