From 969110ca4aa8dd26a8c77f681b19d6f74c11cd93 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Mon, 26 Jun 2017 12:16:30 -0700 Subject: [PATCH] Revert "adb: turn on libusb by default." This reverts commit f2f0b318508fec66fc07044b34f602960f399e5b. libusb seems to be causing flakiness on some machines. Disable it for now. Bug: http://b/62962248 Test: python test_device.py (with DeviceOfflineTest commented out) Change-Id: Ia9de78ab772c22574cf5ca7facb78f22af6d7a71 --- adb/transport_usb.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adb/transport_usb.cpp b/adb/transport_usb.cpp index 47094b82e..2f469204f 100644 --- a/adb/transport_usb.cpp +++ b/adb/transport_usb.cpp @@ -192,7 +192,7 @@ bool should_use_libusb() { #if defined(_WIN32) || !ADB_HOST return false; #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; #endif }