commit 957fb0f726abd3ff226f5fec7939e10e18f40d7d
author A. Cody Schuffelen <schuffelen@google.com> Wed Jan 29 18:48:06 2020 -0800
committer A. Cody Schuffelen <schuffelen@google.com> Wed Jan 29 18:51:02 2020 -0800
tree d3d760c1d805f8830c85c9c814c2f779d5d23797
parent 7189d77e0a95b328eb86db4b9b2df3d3e4a4b15b

Merge adb_connection_maintainer into adb_connector

adb_connection_maintainer was not used by any other libraries or
binaries. This consolidates code by removing a directory.

Test: launch_cvd
Change-Id: I49cf074b278e3745ee3a2125af6bb508380a6c5e

host/frontend/adb_connector/main.cpp

diff --git a/host/frontend/adb_connector/main.cpp b/host/frontend/adb_connector/main.cpp
index 3d3d824..a6f8ebe 100644
--- a/host/frontend/adb_connector/main.cpp
+++ b/host/frontend/adb_connector/main.cpp
@@ -28,8 +28,8 @@
 #include <host/commands/kernel_log_monitor/kernel_log_server.h>
 
 #include "common/libs/fs/shared_fd.h"
+#include "host/frontend/adb_connector/adb_connection_maintainer.h"
 #include "host/libs/config/cuttlefish_config.h"
-#include "host/libs/adb_connection_maintainer/adb_connection_maintainer.h"
 
 DEFINE_string(addresses, "", "Comma-separated list of addresses to "
                              "'adb connect' to");