Loading adb/Android.bp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -313,8 +313,8 @@ cc_library_static { srcs: libadb_srcs + libadb_posix_srcs + [ srcs: libadb_srcs + libadb_posix_srcs + [ "daemon/auth.cpp", "daemon/auth.cpp", "daemon/jdwp_service.cpp", "daemon/jdwp_service.cpp", "daemon/usb.cpp", "daemon/usb_ffs.cpp", "daemon/usb_ffs.cpp", "daemon/usb_legacy.cpp", ], ], local_include_dirs: [ local_include_dirs: [ Loading adb/daemon/usb.cpp→adb/daemon/usb_legacy.cpp +4 −3 Original line number Original line Diff line number Diff line Loading @@ -290,7 +290,8 @@ void usb_init() { dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC)); dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC)); CHECK_NE(-1, dummy_fd.get()); 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) { int usb_write(usb_handle* h, const void* data, int len) { Loading Loading
adb/Android.bp +1 −1 Original line number Original line Diff line number Diff line Loading @@ -313,8 +313,8 @@ cc_library_static { srcs: libadb_srcs + libadb_posix_srcs + [ srcs: libadb_srcs + libadb_posix_srcs + [ "daemon/auth.cpp", "daemon/auth.cpp", "daemon/jdwp_service.cpp", "daemon/jdwp_service.cpp", "daemon/usb.cpp", "daemon/usb_ffs.cpp", "daemon/usb_ffs.cpp", "daemon/usb_legacy.cpp", ], ], local_include_dirs: [ local_include_dirs: [ Loading
adb/daemon/usb.cpp→adb/daemon/usb_legacy.cpp +4 −3 Original line number Original line Diff line number Diff line Loading @@ -290,7 +290,8 @@ void usb_init() { dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC)); dummy_fd.reset(adb_open("/dev/null", O_WRONLY | O_CLOEXEC)); CHECK_NE(-1, dummy_fd.get()); 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) { int usb_write(usb_handle* h, const void* data, int len) { Loading