From ec5bd81a7051e16de17b365484cff1c0f43cbfd0 Mon Sep 17 00:00:00 2001 From: Sashanoraa Date: Wed, 14 May 2025 22:52:21 -0400 Subject: [PATCH] Update adb_client, now with usb lib being a feature flag This update also fixes libusb throwing timeouts when it shouldn't --- Cargo.lock | 2 +- installer/Cargo.toml | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 75f2eba..8c1dce4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 4 [[package]] name = "adb_client" version = "2.1.11" -source = "git+https://github.com/gaykitty/adb_client.git?branch=rayhunter#5bc41626cc7f57b6757ec981c14f3d37ff067f60" +source = "git+https://github.com/gaykitty/adb_client.git?branch=rayhunter#6a8054f0e04be9d669e06631e23882e6403d6e1e" dependencies = [ "async-io", "base64", diff --git a/installer/Cargo.toml b/installer/Cargo.toml index 7a84cfd..40107a6 100644 --- a/installer/Cargo.toml +++ b/installer/Cargo.toml @@ -22,9 +22,16 @@ tokio = { version = "1.44.2", features = ["full"] } tokio-retry2 = "0.5.7" tokio-stream = "0.1.17" -[dependencies.adb_client] +[target.'cfg(target_os = "linux")'.dependencies.adb_client] # path = "../../adb_client/adb_client" git = "https://github.com/gaykitty/adb_client.git" branch = "rayhunter" default-features = false -features = ["usb"] +features = ["trans-nusb"] + +[target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies.adb_client] +# path = "../../adb_client/adb_client" +git = "https://github.com/gaykitty/adb_client.git" +branch = "rayhunter" +default-features = false +features = ["trans-libusb"]