diff options
author | Shaju Mathew <shaju@google.com> | 2024-02-29 16:38:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-29 16:38:19 +0000 |
commit | 5e80f31967e4fee8a84f91470237cc0c85e9cdeb (patch) | |
tree | 1b3d590c67e0ef8568162e84c96d6cfbba6e9691 | |
parent | 59ae5be9242635f60430de177955c3ccd3c0d2cc (diff) | |
parent | 7f5b26856095feb3836f923e47684f41b2a9855f (diff) | |
download | adb-5e80f31967e4fee8a84f91470237cc0c85e9cdeb.tar.gz |
Merge "Revert "Defaulting to libusb for all hosts, including Windows"" into main am: 7f5b268560
Original change: https://android-review.googlesource.com/c/platform/packages/modules/adb/+/2983196
Change-Id: Id9c2c8130210293643f66af59e97f9723046e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | client/transport_usb.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/client/transport_usb.cpp b/client/transport_usb.cpp index 5c0799ee..998f73c9 100644 --- a/client/transport_usb.cpp +++ b/client/transport_usb.cpp @@ -179,6 +179,9 @@ bool is_adb_interface(int usb_class, int usb_subclass, int usb_protocol) { bool should_use_libusb() { bool enable = true; +#if defined(_WIN32) + enable = false; +#endif char* env = getenv("ADB_LIBUSB"); if (env) { enable = (strcmp(env, "1") == 0); |