Backport "Make legacy USB driver default on Linux" from 16.0.0_r4
This commit is contained in:
parent
4f0625a69a
commit
f4e618fff0
2 changed files with 36 additions and 0 deletions
34
0003-Make-legacy-USB-driver-default-on-Linux.patch
Normal file
34
0003-Make-legacy-USB-driver-default-on-Linux.patch
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
From 55d30a3098c29431bcbeb2d2a5f1a0c40844c311 Mon Sep 17 00:00:00 2001
|
||||
From: Fabien Sanglard <sanglardf@google.com>
|
||||
Date: Mon, 23 Jun 2025 11:21:16 -0700
|
||||
Subject: [PATCH] Make legacy USB driver default on Linux
|
||||
|
||||
Bug: 366314975
|
||||
Bug: 398328647
|
||||
Test: Manual
|
||||
Flag: EXEMPT (adb.exe)
|
||||
Change-Id: Id49df58587d3f479d263a5b2da1679a1e675feb5
|
||||
---
|
||||
client/transport_usb.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/vendor/adb/client/transport_usb.cpp b/vendor/adb/client/transport_usb.cpp
|
||||
index 3b0b4906..d3b4929c 100644
|
||||
--- a/vendor/adb/client/transport_usb.cpp
|
||||
+++ b/vendor/adb/client/transport_usb.cpp
|
||||
@@ -177,9 +177,9 @@ bool is_adb_interface(int usb_class, int usb_subclass, int usb_protocol) {
|
||||
}
|
||||
|
||||
bool is_libusb_enabled() {
|
||||
- bool enable = true;
|
||||
-#if defined(_WIN32)
|
||||
- enable = false;
|
||||
+ bool enable = false;
|
||||
+#if defined(__APPLE__)
|
||||
+ enable = true;
|
||||
#endif
|
||||
char* env = getenv("ADB_LIBUSB");
|
||||
if (env) {
|
||||
--
|
||||
2.52.0
|
||||
|
||||
|
|
@ -15,6 +15,8 @@ Source0: https://github.com/nmeum/%{name}/releases/download/%{version}/%{n
|
|||
Patch0: 0001-Fix-libusb-enumeration.patch
|
||||
# https://github.com/nmeum/android-tools/pull/172
|
||||
Patch1: 0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch
|
||||
# https://github.com/nmeum/android-tools/pull/190
|
||||
Patch2: 0003-Make-legacy-USB-driver-default-on-Linux.patch
|
||||
|
||||
BuildRequires: brotli-devel
|
||||
BuildRequires: cmake
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue