usb: switch to new libusb_wrap_sys_device API

Replace use of our custom, patched libusb APIs with the new
libusb_wrap_sys_device() function, which has been submitted to libusb
upstream. This allows us to drop the bindings for the custom APIs (and
will also allow us to drop the libusb patch that introduces them).

For now, keep this path behind the sandboxed-libusb feature to allow
crosvm to build against older libusb versions that do not have the new
API. This should be cleaned up eventually once we are comfortable with
raising the minimum libusb version required.

BUG=b:133773289
TEST=Attach Android device to Linux VM; deploy app via adb

Change-Id: Ie249c6f3f3b4c63210dd163ca7ad03e2de8a8872
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1676601
Tested-by: kokoro <noreply+kokoro@google.com>

1 files changed, 3 insertions, 13 deletions

diff --git a/usb_util/src/bindings.rs b/usb_util/src/bindings.rs
index a3e7152..8f62a01 100644
--- a/usb_util/src/bindings.rs
+++ b/usb_util/src/bindings.rs
@@ -4012,16 +4012,13 @@ extern "C" {
     pub fn libusb_init(ctx: *mut *mut libusb_context) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn libusb_init_jailed(ctx: *mut *mut libusb_context) -> ::std::os::raw::c_int;
-}
-extern "C" {
     pub fn libusb_exit(ctx: *mut libusb_context);
 }
 extern "C" {
-    pub fn libusb_get_device_from_fd(
+    pub fn libusb_wrap_sys_device(
         ctx: *mut libusb_context,
-        fd: ::std::os::raw::c_int,
-        device: *mut *mut libusb_device,
+        fd: __intptr_t,
+        handle: *mut *mut libusb_device_handle,
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
@@ -4199,13 +4196,6 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 extern "C" {
-    pub fn libusb_open_fd(
-        dev: *mut libusb_device,
-        fd: ::std::os::raw::c_int,
-        handle: *mut *mut libusb_device_handle,
-    ) -> ::std::os::raw::c_int;
-}
-extern "C" {
     pub fn libusb_close(dev_handle: *mut libusb_device_handle);
 }
 extern "C" {