commit 15694b3e0970d7688074301fc0397ac16c15c4a2
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 13 18:33:11 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Feb 13 18:33:11 2023 +0000
tree d4923149795810e5942fd0abba1c0fffbdfd9be7
parent 9376d0b3d76bddb62487ecc8676bd125bf057762
parent 48f1ae042983a2aa28d38a74a74a944c564667b4

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

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

Change-Id: Ib3e512b7c5e78944c3f2d1efc4a304e0f09f8b1a
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",