commit fc817e25fe44f3c62aa273268d9e2c2e9057699c
author Yo Chiang <yochiang@google.com> Wed Mar 11 18:14:17 2020 +0800
committer Yo Chiang <yochiang@google.com> Wed Mar 11 18:35:37 2020 +0800
tree cba1d2fcd4a3382cb9ee609dadd2fa16952b189d
parent bd3a3389d3317d7aaa65a98cb1d193505c6523e7

Cleanup unused dependencies

* Cleanup unused headers
* Cleanup libgsid unused dependencies

Test: Build and boot
Change-Id: I22456c176dde524bc51a435bca6fc45d37240f56

Android.bp

diff --git a/Android.bp b/Android.bp
index 174567b..bf15b00 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,14 +55,8 @@
         "gsi_aidl_interface-cpp",
         "libbase",
         "libbinder",
-        "libcutils",
-        "liblog",
-        "libservices",
         "libutils",
     ],
-    static_libs: [
-        "libgsi",
-    ],
     export_include_dirs: ["include"],
 }
 

daemon.cpp

diff --git a/daemon.cpp b/daemon.cpp
index ba05eb6..ca2995d 100644
--- a/daemon.cpp
+++ b/daemon.cpp
@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <getopt.h>
-
 #include <iostream>
 #include <string>
 
@@ -23,7 +21,6 @@
 #include <binder/BinderService.h>
 #include <binder/IPCThreadState.h>
 #include <binder/ProcessState.h>
-#include <libgsi/libgsi.h>
 #include <libgsi/libgsid.h>
 
 #include "gsi_service.h"

gsi_service.cpp

diff --git a/gsi_service.cpp b/gsi_service.cpp
index ab2339b..1bcd3dc 100644
--- a/gsi_service.cpp
+++ b/gsi_service.cpp
@@ -16,12 +16,6 @@
 
 #include "gsi_service.h"
 
-#include <errno.h>
-#include <linux/fs.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <sys/vfs.h>
 #include <unistd.h>
 
@@ -67,8 +61,6 @@
 using android::binder::LazyServiceRegistrar;
 using android::dm::DeviceMapper;
 
-static std::mutex sInstanceLock;
-
 // Default userdata image size.
 static constexpr int64_t kDefaultUserdataSize = int64_t(2) * 1024 * 1024 * 1024;
 

gsi_tool.cpp

diff --git a/gsi_tool.cpp b/gsi_tool.cpp
index 4c246cc..f24fa5d 100644
--- a/gsi_tool.cpp
+++ b/gsi_tool.cpp
@@ -35,7 +35,6 @@
 #include <android-base/strings.h>
 #include <android-base/unique_fd.h>
 #include <android/gsi/IGsiService.h>
-#include <binder/IServiceManager.h>
 #include <cutils/android_reboot.h>
 #include <libgsi/libgsi.h>
 #include <libgsi/libgsid.h>

libgsid.cpp

diff --git a/libgsid.cpp b/libgsid.cpp
index b42833c..23eeae4 100644
--- a/libgsid.cpp
+++ b/libgsid.cpp
@@ -15,7 +15,6 @@
 //
 
 #include <android-base/logging.h>
-#include <android-base/properties.h>
 #include <android/gsi/IGsiService.h>
 #include <binder/IServiceManager.h>
 #include <libgsi/libgsi.h>