| commit | 1e1fe1f8352fa603abed2183dbc8b35f405a325c | [log] [tgz] |
|---|---|---|
| author | Greg Hartman <ghartman@google.com> | Tue Oct 03 16:29:36 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Oct 03 16:29:36 2017 +0000 |
| tree | 634259549680c3127d4315ee31d89475b14ebfca | |
| parent | cda6cd994f52cf52732bc7cc8419b8b1f09542a1 [diff] | |
| parent | 6588a2db3e53cd44440963c9d8808a76fee8aeb8 [diff] |
Merge "Fix position of usbforward.h" into gce-dev
diff --git a/guest/commands/usbforward/BUILD b/common/libs/usbforward/BUILD similarity index 100% rename from guest/commands/usbforward/BUILD rename to common/libs/usbforward/BUILD
diff --git a/guest/commands/usbforward/protocol.h b/common/libs/usbforward/protocol.h similarity index 100% rename from guest/commands/usbforward/protocol.h rename to common/libs/usbforward/protocol.h
diff --git a/guest/commands/usbforward/transport_request.h b/guest/commands/usbforward/transport_request.h index 6068c98..1f76bbe 100644 --- a/guest/commands/usbforward/transport_request.h +++ b/guest/commands/usbforward/transport_request.h
@@ -20,7 +20,7 @@ #include <stdint.h> #include <libusb/libusb.h> -#include "guest/commands/usbforward/protocol.h" +#include "common/libs/usbforward/protocol.h" namespace usb_forward {
diff --git a/guest/commands/usbforward/usb_server.cpp b/guest/commands/usbforward/usb_server.cpp index 2f89155..35fac9a 100644 --- a/guest/commands/usbforward/usb_server.cpp +++ b/guest/commands/usbforward/usb_server.cpp
@@ -23,7 +23,7 @@ #include <cutils/log.h> #include <libusb/libusb.h> #include "common/libs/fs/shared_select.h" -#include "guest/commands/usbforward/protocol.h" +#include "common/libs/usbforward/protocol.h" #include "guest/commands/usbforward/transport_request.h" namespace usb_forward {