Date: Wed, 15 Aug 2018 18:00:23 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r477246 - head/devel/android-tools-adb/files Message-ID: <201808151800.w7FI0ND7073701@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Aug 15 18:00:23 2018 New Revision: 477246 URL: https://svnweb.freebsd.org/changeset/ports/477246 Log: devel/android-tools-adb: adjust for USB dispatch on Windows after r477245 See https://android.googlesource.com/platform/system/core/+/9425996b4521%5E!/ Modified: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp (contents, props changed) head/devel/android-tools-adb/files/patch-adb_usb.h (contents, props changed) Modified: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp Wed Aug 15 18:00:23 2018 (r477246) @@ -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 { Modified: head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp Wed Aug 15 18:00:23 2018 (r477246) @@ -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; Modified: head/devel/android-tools-adb/files/patch-adb_usb.h ============================================================================== --- head/devel/android-tools-adb/files/patch-adb_usb.h Wed Aug 15 17:49:49 2018 (r477245) +++ head/devel/android-tools-adb/files/patch-adb_usb.h Wed Aug 15 18:00:23 2018 (r477246) @@ -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*);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808151800.w7FI0ND7073701>