commit 61e9e39b7e83f6e1c5189bcd95471dfa95aca6d5
author Josh Gao <jmgao@google.com> Mon Oct 08 14:42:19 2018 -0700
committer Josh Gao <jmgao@google.com> Thu Oct 18 13:58:06 2018 -0700
tree 779ec47e083a59a3cd5a24abd7882310e6f1c5d9
parent d506dac0a02020faf7d689e50c1350f529d52c08

adbd: rename daemon/usb.cpp to daemon/usb_legacy.cpp.

Change-Id: I0b369d1653220f7d9b542ad06998c5c2c3e129a2
Test: mma

adb/Android.bp

diff --git a/adb/Android.bp b/adb/Android.bp
index 7cfa371..d7eb870 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -313,8 +313,8 @@
     srcs: libadb_srcs + libadb_posix_srcs + [
         "daemon/auth.cpp",
         "daemon/jdwp_service.cpp",
-        "daemon/usb.cpp",
         "daemon/usb_ffs.cpp",
+        "daemon/usb_legacy.cpp",
     ],
 
     local_include_dirs: [

adb/daemon/usb_legacy.cpp

diff --git a/adb/daemon/usb.cpp b/adb/daemon/usb_legacy.cpp
similarity index 97%
rename from adb/daemon/usb.cpp
rename to adb/daemon/usb_legacy.cpp
index 7fbccc3..fcd2652 100644
--- a/adb/daemon/usb.cpp
+++ b/adb/daemon/usb_legacy.cpp
@@ -94,7 +94,7 @@
     return true;
 }
 
-static void usb_ffs_open_thread(usb_handle *usb) {
+static void usb_ffs_open_thread(usb_handle* usb) {
     adb_thread_setname("usb ffs open");
 
     while (true) {
@@ -265,7 +265,7 @@
     h->notify.notify_one();
 }
 
-usb_handle *create_usb_handle(unsigned num_bufs, unsigned io_size) {
+usb_handle* create_usb_handle(unsigned num_bufs, unsigned io_size) {
     usb_handle* h = new usb_handle();
 
     if (android::base::GetBoolProperty("sys.usb.ffs.aio_compat", false)) {
@@ -290,7 +290,8 @@
     dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC));
     CHECK_NE(-1, dummy_fd.get());
 
-    std::thread(usb_ffs_open_thread, create_usb_handle(USB_FFS_NUM_BUFS, USB_FFS_BULK_SIZE)).detach();
+    std::thread(usb_ffs_open_thread, create_usb_handle(USB_FFS_NUM_BUFS, USB_FFS_BULK_SIZE))
+            .detach();
 }
 
 int usb_write(usb_handle* h, const void* data, int len) {