From 3305d48b0be5c6d1578e04e9835c236335a40a9f Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Thu, 26 Sep 2019 00:02:29 -0700
Subject: [PATCH] minadbd: Export minadbd/types.h to libinstall.

Test: mmma bootable/recovery
Change-Id: I503e942b23cc51024aa752c1eb3db5455a44a9d1
---
 install/Android.bp                                   |  8 ++++----
 install/adb_install.cpp                              |  2 +-
 minadbd/Android.bp                                   | 11 +++++++++--
 minadbd/{minadbd_types.h => include/minadbd/types.h} |  0
 minadbd/minadbd.cpp                                  |  2 +-
 minadbd/minadbd_services.cpp                         |  2 +-
 minadbd/minadbd_services_test.cpp                    |  2 +-
 7 files changed, 17 insertions(+), 10 deletions(-)
 rename minadbd/{minadbd_types.h => include/minadbd/types.h} (100%)

diff --git a/install/Android.bp b/install/Android.bp
index 89cc3f23..78c3a578 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -19,10 +19,6 @@ cc_defaults {
         "recovery_defaults",
     ],
 
-    header_libs: [
-        "libminadbd_headers",
-    ],
-
     shared_libs: [
         "libbase",
         "libbootloader_message",
@@ -69,6 +65,10 @@ cc_library_static {
         "wipe_device.cpp",
     ],
 
+    header_libs: [
+        "libminadbd_headers",
+    ],
+
     shared_libs: [
         "librecovery_ui",
     ],
diff --git a/install/adb_install.cpp b/install/adb_install.cpp
index ed664429..ee79a32c 100644
--- a/install/adb_install.cpp
+++ b/install/adb_install.cpp
@@ -44,7 +44,7 @@
 #include "fuse_sideload.h"
 #include "install/install.h"
 #include "install/wipe_data.h"
-#include "minadbd_types.h"
+#include "minadbd/types.h"
 #include "otautil/sysutil.h"
 #include "recovery_ui/device.h"
 #include "recovery_ui/ui.h"
diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index 805d12af..07171259 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -26,6 +26,10 @@ cc_defaults {
     include_dirs: [
         "system/core/adb",
     ],
+
+    header_libs: [
+        "libminadbd_headers",
+    ],
 }
 
 // `libminadbd_services` is analogous to the `libadbd_services` for regular `adbd`, but providing
@@ -58,9 +62,12 @@ cc_library {
 cc_library_headers {
     name: "libminadbd_headers",
     recovery_available: true,
-    // TODO create a include dir
     export_include_dirs: [
-        ".",
+        "include",
+    ],
+    // adb_install.cpp
+    visibility: [
+        "//bootable/recovery/install",
     ],
 }
 
diff --git a/minadbd/minadbd_types.h b/minadbd/include/minadbd/types.h
similarity index 100%
rename from minadbd/minadbd_types.h
rename to minadbd/include/minadbd/types.h
diff --git a/minadbd/minadbd.cpp b/minadbd/minadbd.cpp
index c80d5490..7b82faa0 100644
--- a/minadbd/minadbd.cpp
+++ b/minadbd/minadbd.cpp
@@ -28,8 +28,8 @@
 #include "adb_auth.h"
 #include "transport.h"
 
+#include "minadbd/types.h"
 #include "minadbd_services.h"
-#include "minadbd_types.h"
 
 using namespace std::string_literals;
 
diff --git a/minadbd/minadbd_services.cpp b/minadbd/minadbd_services.cpp
index c31afbe0..cabcdaa0 100644
--- a/minadbd/minadbd_services.cpp
+++ b/minadbd/minadbd_services.cpp
@@ -43,7 +43,7 @@
 #include "adb_utils.h"
 #include "fuse_adb_provider.h"
 #include "fuse_sideload.h"
-#include "minadbd_types.h"
+#include "minadbd/types.h"
 #include "services.h"
 #include "sysdeps.h"
 
diff --git a/minadbd/minadbd_services_test.cpp b/minadbd/minadbd_services_test.cpp
index f8787379..b694a57d 100644
--- a/minadbd/minadbd_services_test.cpp
+++ b/minadbd/minadbd_services_test.cpp
@@ -35,8 +35,8 @@
 #include "adb_io.h"
 #include "fuse_adb_provider.h"
 #include "fuse_sideload.h"
+#include "minadbd/types.h"
 #include "minadbd_services.h"
-#include "minadbd_types.h"
 #include "socket.h"
 
 class MinadbdServicesTest : public ::testing::Test {