commit 27831220711f5ab4ccb2fca6253786c13245559a
author Josh Gao <jmgao@google.com> Fri Mar 27 18:09:56 2020 -0700
committer Josh Gao <jmgao@google.com> Tue Mar 31 16:05:36 2020 -0700
tree 7385a5d2c345151c2412846b50e3b74e11106f3a
parent 3db3d6f8d6cb5fd51ba477f328aeba0dc5bdfa0a

Move adbd's legacy USB implementation to fastboot.

This code path is effectively dead in adbd, and fastboot's dependency on
libadbd makes it hard to refactor adbd's dependencies.

Bug: http://b/150317254
Test: built and flashed aosp_walleye-eng
Change-Id: I5118136d32fdcbbd011559ed0a4a71e1dc7bf064
Merged-In: I5118136d32fdcbbd011559ed0a4a71e1dc7bf064
(cherry picked from commit 0871824de6c5b868f2a2e67c9b5673cb2181b4c6)

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 98db191..44e5dac 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -66,6 +66,10 @@
 #include "daemon/logging.h"
 #endif
 
+#if ADB_HOST
+#include "client/usb.h"
+#endif
+
 std::string adb_version() {
     // Don't change the format of this --- it's parsed by ddmlib.
     return android::base::StringPrintf(