commit 31ab19f78bbe50cbafbc18656938e399e9da6d4c
author Inseob Kim <inseob@google.com> Tue Sep 10 14:56:19 2019 +0900
committer Inseob Kim <inseob@google.com> Tue Sep 10 14:56:19 2019 +0900
tree 9338b04c0206b9941b0faa9da2e8bfd06c297ac2
parent 481066c7ce91bab9a0bcab6cb5bc2d0d9fb3cb23

Remove static vndk dep from vendor modules

Instead, vendor modules should link against shared vndk.

Bug: 137178339
Test: mma
Change-Id: Idfce608a3d62de7c4c0e6b02b7cbd80de0a5207f

automotive/vehicle/2.0/default/Android.bp

diff --git a/automotive/vehicle/2.0/default/Android.bp b/automotive/vehicle/2.0/default/Android.bp
index 3fd0539..ed09859 100644
--- a/automotive/vehicle/2.0/default/Android.bp
+++ b/automotive/vehicle/2.0/default/Android.bp
@@ -71,10 +71,10 @@
     whole_static_libs: ["android.hardware.automotive.vehicle@2.0-manager-lib"],
     shared_libs: [
         "libbase",
+        "libjsoncpp",
         "libprotobuf-cpp-lite",
     ],
     static_libs: [
-        "libjsoncpp",
         "libqemu_pipe",
         "android.hardware.automotive.vehicle@2.0-libproto-native",
     ],
@@ -106,13 +106,13 @@
     srcs: ["VehicleService.cpp"],
     shared_libs: [
         "libbase",
+        "libjsoncpp",
         "libprotobuf-cpp-lite",
     ],
     static_libs: [
         "android.hardware.automotive.vehicle@2.0-manager-lib",
         "android.hardware.automotive.vehicle@2.0-default-impl-lib",
         "android.hardware.automotive.vehicle@2.0-libproto-native",
-        "libjsoncpp",
         "libqemu_pipe",
     ],
 }