commit 8e8eb792bd30ebb42767869ef1fcace987a1a25c
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 13 19:32:06 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 13 19:32:06 2023 +0000
tree f7d5a14435e3ff0952e0ebc218ec1fc29205ddb4
parent c6c46b885a2071540f88dbcc363f67a4ae1dd02a
parent 15694b3e0970d7688074301fc0397ac16c15c4a2

Merge "libvkjson: Use shared libjsoncpp" am: 99702ea065 am: 48f1ae0429 am: 15694b3e09

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2431992

Change-Id: I2bdb83fa87e13823eb4ef4e91dfc02246131a3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vulkan/vkjson/Android.bp

diff --git a/vulkan/vkjson/Android.bp b/vulkan/vkjson/Android.bp
index b6d3a0b..b544245 100644
--- a/vulkan/vkjson/Android.bp
+++ b/vulkan/vkjson/Android.bp
@@ -25,10 +25,8 @@
         ".",
     ],
     shared_libs: [
-        "libvulkan",
-    ],
-    whole_static_libs: [
         "libjsoncpp",
+        "libvulkan",
     ],
     export_shared_lib_headers: [
         "libvulkan",