summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-02-13 17:47:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-13 17:47:17 +0000
commit48f1ae042983a2aa28d38a74a74a944c564667b4 (patch)
tree042fa9b94fa314d4d007db126c99673adabd4698
parent11c13baf349a9e75330c1a801fc50873cd69b620 (diff)
parent99702ea06520126232c60f4ebaf454a7dd7d33a5 (diff)
Merge "libvkjson: Use shared libjsoncpp" am: 99702ea065
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2431992 Change-Id: Iaf586936039f21881b12a3225e8930bc654531a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--vulkan/vkjson/Android.bp4
1 files changed, 1 insertions, 3 deletions
diff --git a/vulkan/vkjson/Android.bp b/vulkan/vkjson/Android.bp
index b6d3a0b45f..b544245a7a 100644
--- a/vulkan/vkjson/Android.bp
+++ b/vulkan/vkjson/Android.bp
@@ -25,10 +25,8 @@ cc_library_shared {
".",
],
shared_libs: [
- "libvulkan",
- ],
- whole_static_libs: [
"libjsoncpp",
+ "libvulkan",
],
export_shared_lib_headers: [
"libvulkan",