commit 8cc2ccd68b13c9833c45771b86cdb4befa390b0b
author Greg Hartman <ghartman@google.com> Fri Sep 29 16:32:53 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:29 2017 -0700
tree 908039fe5167ffa0c546273f27d517c575f140fd
parent e4c52f608e0092f4929cd7df764bbe665e408064

Fix position of usbforward.h

BUG: 67113612
Change-Id: If61f99cf93d84e82056adce3dd51b04ba1dbbf36
(cherry picked from commit 60e2d13afb68f192bb2ae3471a868ed310b97cc5)

vadb/BUILD

diff --git a/vadb/BUILD b/vadb/BUILD
index 2717a5e..26a5dd4 100644
--- a/vadb/BUILD
+++ b/vadb/BUILD
@@ -30,7 +30,7 @@
     ],
     deps = [
         "@cuttlefish//common/libs/fs",
-        "@cuttlefish//guest/commands/usbforward:protocol",
+        "@cuttlefish//common/libs/usbforward:protocol",
         "@gflags_repo//:gflags",
         "@glog_repo//:glog",
         "//host/vadb/usbip:usbip_lib",

vadb/usb_cmd.h

diff --git a/vadb/usb_cmd.h b/vadb/usb_cmd.h
index d882c87..9090f20 100644
--- a/vadb/usb_cmd.h
+++ b/vadb/usb_cmd.h
@@ -16,7 +16,7 @@
 #pragma once
 
 #include "common/libs/fs/shared_fd.h"
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 
 namespace vadb {
 // USBCommand is an abstraction of a proxied USB command.

vadb/usb_cmd_attach.cpp

diff --git a/vadb/usb_cmd_attach.cpp b/vadb/usb_cmd_attach.cpp
index 190fdc5..9c3dcda 100644
--- a/vadb/usb_cmd_attach.cpp
+++ b/vadb/usb_cmd_attach.cpp
@@ -15,7 +15,7 @@
  */
 #include <glog/logging.h>
 
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd_attach.h"
 
 namespace vadb {

vadb/usb_cmd_control_transfer.h

diff --git a/vadb/usb_cmd_control_transfer.h b/vadb/usb_cmd_control_transfer.h
index 26d6c9d..c9ad2ac 100644
--- a/vadb/usb_cmd_control_transfer.h
+++ b/vadb/usb_cmd_control_transfer.h
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd.h"
 #include "host/vadb/usbip/device.h"
 

vadb/usb_cmd_data_transfer.h

diff --git a/vadb/usb_cmd_data_transfer.h b/vadb/usb_cmd_data_transfer.h
index 61d5940..f07b0ab 100644
--- a/vadb/usb_cmd_data_transfer.h
+++ b/vadb/usb_cmd_data_transfer.h
@@ -18,7 +18,7 @@
 #include <memory>
 #include <stdint.h>
 
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd.h"
 #include "host/vadb/usbip/device.h"
 

vadb/usb_cmd_device_list.h

diff --git a/vadb/usb_cmd_device_list.h b/vadb/usb_cmd_device_list.h
index e8e5c5b..911db81 100644
--- a/vadb/usb_cmd_device_list.h
+++ b/vadb/usb_cmd_device_list.h
@@ -17,7 +17,7 @@
 
 #include <functional>
 #include <vector>
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd.h"
 
 namespace vadb {

vadb/usb_cmd_heartbeat.cpp

diff --git a/vadb/usb_cmd_heartbeat.cpp b/vadb/usb_cmd_heartbeat.cpp
index f32ba0f..8584de6 100644
--- a/vadb/usb_cmd_heartbeat.cpp
+++ b/vadb/usb_cmd_heartbeat.cpp
@@ -15,7 +15,7 @@
  */
 #include <glog/logging.h>
 
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd_heartbeat.h"
 
 namespace vadb {

vadb/virtual_adb_client.h

diff --git a/vadb/virtual_adb_client.h b/vadb/virtual_adb_client.h
index e78fd7d..8fae2d7 100644
--- a/vadb/virtual_adb_client.h
+++ b/vadb/virtual_adb_client.h
@@ -19,7 +19,7 @@
 
 #include "common/libs/fs/shared_fd.h"
 #include "common/libs/fs/shared_select.h"
-#include "guest/commands/usbforward/protocol.h"
+#include "common/libs/usbforward/protocol.h"
 #include "host/vadb/usb_cmd.h"
 #include "host/vadb/usbip/device.h"
 #include "host/vadb/usbip/device_pool.h"