diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2018-08-15 18:00:23 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2018-08-15 18:00:23 +0000 |
| commit | 93af82a1fc8a84b10d1cdf4ff29eca39710f45ba (patch) | |
| tree | 8c84d86d26ccee2bad969605da10d929bbf547b1 | |
| parent | devel/android-tools-adb: unbreak on DragonFly after r477244 (diff) | |
devel/android-tools-adb: adjust for USB dispatch on Windows after r477245
See https://android.googlesource.com/platform/system/core/+/9425996b4521%5E!/
Notes
Notes:
svn path=/head/; revision=477246
3 files changed, 8 insertions, 8 deletions
diff --git a/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp index 70ac0435a316..bbd7eaf3d82f 100644 --- a/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp +++ b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp @@ -21,7 +21,7 @@ }; namespace libusb { -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) struct usb_handle : public ::usb_handle { +#else +struct usb_handle { diff --git a/devel/android-tools-adb/files/patch-adb_transport__usb.cpp b/devel/android-tools-adb/files/patch-adb_transport__usb.cpp index cb5cb68a926f..a89b9bfac585 100644 --- a/devel/android-tools-adb/files/patch-adb_transport__usb.cpp +++ b/devel/android-tools-adb/files/patch-adb_transport__usb.cpp @@ -1,11 +1,11 @@ ---- adb/transport_usb.cpp.orig 2017-06-20 10:50:27 UTC +--- adb/transport_usb.cpp.orig 2018-06-21 00:58:42 UTC +++ adb/transport_usb.cpp -@@ -191,6 +191,8 @@ int is_adb_interface(int usb_class, int usb_subclass, +@@ -186,6 +186,8 @@ int is_adb_interface(int usb_class, int usb_subclass, bool should_use_libusb() { - #if defined(_WIN32) || !ADB_HOST + #if !ADB_HOST return false; -+#elif !defined(__linux__) && !defined(__APPLE__) ++#elif !defined(__linux__) && !defined(__APPLE__) && !defined(_WIN32) + return true; #else - static bool disable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "0") == 0; - return !disable; + static bool enable = getenv("ADB_LIBUSB") && strcmp(getenv("ADB_LIBUSB"), "1") == 0; + return enable; diff --git a/devel/android-tools-adb/files/patch-adb_usb.h b/devel/android-tools-adb/files/patch-adb_usb.h index c38b16752cc2..ca72a7ee6a48 100644 --- a/devel/android-tools-adb/files/patch-adb_usb.h +++ b/devel/android-tools-adb/files/patch-adb_usb.h @@ -4,7 +4,7 @@ ADB_USB_INTERFACE(libusb::usb_handle*); } -+#if defined(__linux__) || defined(__APPLE__) ++#if defined(__linux__) || defined(__APPLE__) || defined(_WIN32) namespace native { struct usb_handle; ADB_USB_INTERFACE(native::usb_handle*); |