Factor the client/server Library Out

Test: build
Bug: 181371253
Change-Id: I6b0acd1285ecf5154760674076a42de9ad0a41e2
Merged-In: I6b0acd1285ecf5154760674076a42de9ad0a41e2

1 files changed, 52 insertions, 16 deletions

diff --git a/hal/vehicle/2.0/Android.bp b/hal/vehicle/2.0/Android.bp
index 7cc3d3f..8293178 100644
--- a/hal/vehicle/2.0/Android.bp
+++ b/hal/vehicle/2.0/Android.bp
@@ -87,6 +87,56 @@ genrule {
     ],
 }
 
+cc_library_static {
+    name: "android.hardware.automotive.vehicle@2.0-virtualization-client-lib",
+    defaults: ["vhal_v2_0_target_defaults"],
+    vendor: true,
+    srcs: [
+        "GrpcVehicleClient.cpp",
+    ],
+    whole_static_libs: [
+        "android.hardware.automotive.utils.vsockinfo",
+        "android.hardware.automotive.vehicle@2.0-manager-lib",
+        "android.hardware.automotive.vehicle@2.0-default-impl-lib",
+        "android.hardware.automotive.vehicle@2.0-grpc-trout",
+        "android.hardware.automotive.vehicle@2.0-virtualization-utils",
+    ],
+    shared_libs: [
+        "libgrpc++",
+        "libprotobuf-cpp-full",
+    ],
+    export_include_dirs: ["."],
+    cflags: [
+        "-Wno-unused-parameter",
+    ],
+}
+
+cc_library_static {
+    name: "android.hardware.automotive.vehicle@2.0-virtualization-grpc-server-lib",
+    defaults: ["vhal_v2_0_defaults"],
+    host_supported: true,
+    vendor: true,
+    srcs: [
+        "GarageModeServerSideHandler.cpp",
+        "GrpcVehicleServer.cpp",
+        "PowerStateListener.cpp",
+    ],
+    whole_static_libs: [
+        "android.hardware.automotive.utils.vsockinfo",
+        "android.hardware.automotive.vehicle@2.0-grpc-trout",
+        "android.hardware.automotive.vehicle@2.0-server-impl-lib",
+        "android.hardware.automotive.vehicle@2.0-virtualization-utils",
+    ],
+    shared_libs: [
+        "libgrpc++",
+        "libprotobuf-cpp-full",
+    ],
+    export_include_dirs: ["."],
+    cflags: [
+        "-Wno-unused-parameter",
+    ],
+}
+
 cc_binary {
     name: "android.hardware.automotive.vehicle@2.0-virtualization-service",
     defaults: ["vhal_v2_0_target_defaults"],
@@ -94,7 +144,6 @@ cc_binary {
     vendor: true,
     relative_install_path: "hw",
     srcs: [
-        "GrpcVehicleClient.cpp",
         "VirtualizedVehicleService.cpp",
         "WatchdogClient.cpp",
     ],
@@ -107,11 +156,7 @@ cc_binary {
         "libgrpc++",
     ],
     static_libs: [
-        "android.hardware.automotive.utils.vsockinfo",
-        "android.hardware.automotive.vehicle@2.0-manager-lib",
-        "android.hardware.automotive.vehicle@2.0-default-impl-lib",
-        "android.hardware.automotive.vehicle@2.0-grpc-trout",
-        "android.hardware.automotive.vehicle@2.0-virtualization-utils",
+        "android.hardware.automotive.vehicle@2.0-virtualization-client-lib",
         "libqemu_pipe",
     ],
     cflags: [
@@ -127,9 +172,6 @@ cc_binary {
     host_supported: true,
     vendor: true,
     srcs: [
-        "GarageModeServerSideHandler.cpp",
-        "GrpcVehicleServer.cpp",
-        "PowerStateListener.cpp",
         "VirtualizationGrpcServer.cpp",
     ],
     shared_libs: [
@@ -139,12 +181,6 @@ cc_binary {
         "libgrpc++",
     ],
     static_libs: [
-        "android.hardware.automotive.utils.vsockinfo",
-        "android.hardware.automotive.vehicle@2.0-server-impl-lib",
-        "android.hardware.automotive.vehicle@2.0-grpc-trout",
-        "android.hardware.automotive.vehicle@2.0-virtualization-utils",
-    ],
-    cflags: [
-        "-Wno-unused-parameter",
+        "android.hardware.automotive.vehicle@2.0-virtualization-grpc-server-lib",
     ],
 }