Factor GetGsiService into a helper library.

Bug: 140204341
Test: gsi_tool
Change-Id: I40fb2ff6ad58346d0711b971de5d1a7d3fba6774

1 files changed, 24 insertions, 2 deletions

diff --git a/Android.bp b/Android.bp
index 34ec996..421ece2 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,14 +18,16 @@ cc_binary {
     name: "gsi_tool",
     shared_libs: [
         "gsi_aidl_interface-cpp",
-        "libbinder",
         "libbase",
+        "libbinder",
         "libcutils",
         "libgsi",
         "liblog",
-        "libservices",
         "libutils",
     ],
+    static_libs: [
+        "libgsid",
+    ],
     srcs: [
         "gsi_tool.cpp",
     ],
@@ -44,6 +46,26 @@ cc_library {
     export_include_dirs: ["include"],
 }
 
+cc_library_static {
+    name: "libgsid",
+    srcs: [
+        "libgsid.cpp",
+    ],
+    shared_libs: [
+        "gsi_aidl_interface-cpp",
+        "libbase",
+        "libbinder",
+        "libcutils",
+        "liblog",
+        "libservices",
+        "libutils",
+    ],
+    static_libs: [
+        "libgsi",
+    ],
+    export_include_dirs: ["include"],
+}
+
 cc_library_headers {
     name: "libgsi_headers",
     host_supported: true,