Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

This reverts commit 20bf6bd216.

0002-extras-libjsonpb-Fix-incompatibility-with-protobuf-v30.patch

@@ -0,0 +1,36 @@
+From 36c605004ae1c75813181ffe4c59907016aaf9e9 Mon Sep 17 00:00:00 2001
+From: Biswapriyo Nath <nathbappai@gmail.com>
+Date: Tue, 22 Apr 2025 15:12:23 +0000
+Subject: [PATCH] extras/libjsonpb: Fix incompatibility with protobuf v30
+
+This commit fixes the following compiler error.
+
+jsonpb.cpp:36:44: error: invalid operands to binary expression (
+'basic_string<char, char_traits<char>, allocator<char>>' and
+'internal::DescriptorStringView' (aka 'basic_string_view<char>'))
+36 |   return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name();
+   |          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+More info here https://protobuf.dev/news/2024-10-02/#descriptor-apis
+
+Change-Id: I3c76d51dfdfbe013eaa5031e6194bf5edae1be35
+---
+ libjsonpb/parse/jsonpb.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vendor/extras/libjsonpb/parse/jsonpb.cpp b/vendor/extras/libjsonpb/parse/jsonpb.cpp
+index b342c2b..ebd71bf 100644
+--- a/vendor/extras/libjsonpb/parse/jsonpb.cpp
++++ b/vendor/extras/libjsonpb/parse/jsonpb.cpp
+@@ -33,7 +33,7 @@ using google::protobuf::util::TypeResolver;
+ static constexpr char kTypeUrlPrefix[] = "type.googleapis.com";
+ 
+ std::string GetTypeUrl(const Message& message) {
+-  return std::string(kTypeUrlPrefix) + "/" + message.GetDescriptor()->full_name();
++  return std::string(kTypeUrlPrefix) + "/" + std::string(message.GetDescriptor()->full_name());
+ }
+ 
+ ErrorOr<std::string> MessageToJsonString(const Message& message) {
+-- 
+2.49.0
+

0003-Make-legacy-USB-driver-default-on-Linux.patch

@@ -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
+

adb.service

@@ -1,14 +0,0 @@
-# Systemd unit file for adb
-
-[Unit]
-Description=Android Debug Bridge (adb) service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/adb start-server
-ExecStop=/usr/bin/adb kill-server
-PrivateTmp=yes
-Environment=HOME=/var/lib/adb
-
-[Install]
-WantedBy=multi-user.target

android-tools.spec

@@ -1,5 +1,3 @@
-%global _hardened_build 1
-
 Name:          android-tools
 Version:       35.0.2
 Release:       %autorelease
@@ -13,10 +11,12 @@ URL:           http://developer.android.com/guide/developing/tools/
 
 #  Sources with all needed patches and cmakelists live there now: 
 Source0:       https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
-Source1:       51-android.rules
-Source2:       adb.service
 # https://github.com/nmeum/android-tools/issues/153
 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
@@ -72,7 +72,6 @@ setup between the host and the target phone as adb.
 
 %prep
 %autosetup -p1
-cp -p %{SOURCE1} 51-android.rules
 
 %build
 export GO111MODULE=off
@@ -81,24 +80,8 @@ export GO111MODULE=off
 
 %install
 %cmake_install
-install -p -D -m 0644 %{SOURCE2} \
-    %{buildroot}%{_unitdir}/adb.service
-install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
-
-%post
-%systemd_post adb.service
-
-%preun
-%systemd_preun adb.service
-
-%postun
-%systemd_postun_with_restart adb.service
 
 %files
-%doc 51-android.rules
-%{_unitdir}/adb.service
-%attr(0755,root,root) %dir %{_sharedstatedir}/adb
-%attr(0755,root,root) %dir %{_datadir}/android-tools
 #ASL2.0 and BSD
 %{_bindir}/adb
 #ASL2.0

generate_build.rb

@@ -1,234 +0,0 @@
-#!/usr/bin/ruby
-
-# Android build system is complicated and does not allow to build
-# separate parts easily.
-# This script tries to mimic Android build rules.
-
-def expand(dir, files)
-  files.map{|f| File.join(dir,f)}
-end
-
-# Compiles sources to *.o files.
-# Returns array of output *.o filenames
-def compile(sources, cflags)
-  outputs = []
-  for s in sources
-    ext = File.extname(s)
-
-    case ext
-    when '.c'
-      cc = 'cc'
-      lang_flags = '-std=gnu11 $CFLAGS $CPPFLAGS'
-    when '.cpp', '.cc'
-      cc = 'cxx'
-      lang_flags = '-std=gnu++17 $CXXFLAGS $CPPFLAGS'
-    else
-        raise "Unknown extension #{ext}"
-    end
-
-    output = s + '.o'
-    outputs << output
-    puts "build #{output}: #{cc} #{s}\n    cflags = #{lang_flags} #{cflags}"
-  end
-
-  return outputs
-end
-
-# dir - directory where ninja file is located
-# lib - static library path relative to dir
-def subninja(dir, lib)
-  puts "subninja #{dir}build.ninja"
-  return lib.each{|l| dir + l}
-end
-
-# Links object files
-def link(output, objects, ldflags)
-  puts "build #{output}: link #{objects.join(' ')}\n    ldflags = #{ldflags} $LDFLAGS"
-end
-
-puts "# This set of commands generated by generate_build.rb script\n\n"
-puts "CC = #{ENV['CC'] || 'clang'}"
-puts "CXX = #{ENV['CXX'] || 'clang++'}\n\n"
-puts "CFLAGS = #{ENV['CFLAGS']}"
-puts "CXXFLAGS = #{ENV['CXXFLAGS']}"
-puts "LDFLAGS = #{ENV['LDFLAGS']}"
-puts "PKGVER = #{ENV['PKGVER']}\n\n"
-
-
-puts """
-rule cc
-  command = $CC $cflags -c $in -o $out
-
-rule cxx
-  command = $CXX $cflags -c $in -o $out
-
-rule link
-  command = $CXX $ldflags $LDFLAGS $in -o $out
-
-
-"""
-
-adbdfiles = %w(
-  adb.cpp
-  adb_io.cpp
-  adb_listeners.cpp
-  adb_trace.cpp
-  adb_utils.cpp
-  adb_unique_fd.cpp
-  sockets.cpp
-  transport.cpp
-  transport_local.cpp
-  transport_usb.cpp
-  fdevent.cpp
-  shell_service_protocol.cpp
-)
-libadbd = compile(expand('core/adb', adbdfiles), '-DADB_HOST=1 -Icore/diagnose_usb/include -Icore/include -Icore/base/include -Icore/adb -Icore/libcrypto_utils/include')
-
-adbfiles = %w(
-  client/auth.cpp
-  client/console.cpp
-  socket_spec.cpp
-  client/bugreport.cpp
-  client/line_printer.cpp
-  client/commandline.cpp
-  client/adb_client.cpp
-  services.cpp
-  client/file_sync_client.cpp
-  sysdeps_unix.cpp
-  sysdeps/errno.cpp
-  sysdeps/posix/network.cpp
-  client/main.cpp
-  client/usb_dispatch.cpp
-  client/usb_linux.cpp
-  client/usb_libusb.cpp
-  client/transport_mdns.cpp
-)
-libadb = compile(expand('core/adb', adbfiles), '-D_GNU_SOURCE -DADB_HOST=1 -Icore/libcrypto_utils/include -Iboringssl/src/include -Icore/include -Icore/base/include -Icore/adb -Imdnsresponder/mDNSShared')
-
-basefiles = %w(
-  file.cpp
-  threads.cpp
-  logging.cpp
-  parsenetaddress.cpp
-  stringprintf.cpp
-  strings.cpp
-  errors_unix.cpp
-  test_utils.cpp
-)
-libbase = compile(expand('core/base', basefiles), '-DADB_HOST=1 -Icore/base/include -Icore/include')
-
-logfiles = %w(
-  log_event_write.c
-  fake_log_device.c
-  log_event_list.c
-  logger_write.c
-  config_write.c
-  config_read.c
-  logger_lock.c
-  local_logger.c
-  fake_writer.c
-  logger_name.c
-  stderr_write.c
-  logprint.c
-)
-liblog = compile(expand('core/liblog', logfiles), '-DLIBLOG_LOG_TAG=1006 -D_XOPEN_SOURCE=700 -DFAKE_LOG_DEVICE=1 -Icore/libsystem/include -Icore/liblog/include -Icore/include')
-
-cutilsfiles = %w(
-  fs_config.cpp
-  canned_fs_config.cpp
-  android_get_control_file.cpp
-  socket_network_client_unix.cpp
-  socket_inaddr_any_server_unix.cpp
-  sockets.cpp
-  sockets_unix.cpp
-  socket_local_client_unix.cpp
-  socket_local_server_unix.cpp
-)
-libcutils = compile(expand('core/libcutils', cutilsfiles), '-D_GNU_SOURCE -Icore/libcutils/include -Icore/include -Icore/base/include')
-
-diagnoseusbfiles = %w(
-  diagnose_usb.cpp
-)
-libdiagnoseusb = compile(expand('core/diagnose_usb', diagnoseusbfiles), '-Icore/diagnose_usb/include -Icore/include -Icore/base/include')
-
-libcryptofiles = %w(
-  android_pubkey.c
-)
-libcrypto = compile(expand('core/libcrypto_utils', libcryptofiles), '-Icore/libcrypto_utils/include -Iboringssl/src/include')
-
-utilfiles = %w(
-  FileMap.cpp
-  Unicode.cpp
-  SharedBuffer.cpp
-  String8.cpp
-  String16.cpp
-)
-libutil = compile(expand('core/libutils', utilfiles), '-Icore/include')
-
-mdnsfiles = %w(
-  mDNSShared/dnssd_ipc.c
-  mDNSShared/dnssd_clientstub.c
-)
-mdns = compile(expand('mdnsresponder', mdnsfiles), '-D_GNU_SOURCE -DHAVE_IPV6 -DHAVE_LINUX -DNOT_HAVE_SA_LEN -DUSES_NETLINK -UMDNS_DEBUGMSGS -DMDNS_DEBUGMSGS=0 -Imdnsresponder/mDNSShared -Imdnsresponder/mDNSCore -Iinclude')
-
-zipfiles = %w(
-  zip_archive_stream_entry.cc
-  zip_archive.cc
-)
-libzip = compile(expand('core/libziparchive', zipfiles), '-Icore/libziparchive/include -Icore/base/include -Icore/include')
-
-boringcryptofiles = %w(
-  bn/cmp.c
-  bn/bn.c
-  bytestring/cbb.c
-  mem.c
-  buf/buf.c
-  bio/file.c
-  bn/convert.c
-  base64/base64.c
-)
-
-boringcrypto = compile(expand('boringssl/src/crypto', boringcryptofiles), '-Iboringssl/src/include -Iinclude')
-
-link('adb', libbase + liblog + libcutils + libcrypto + libadbd + libadb + libdiagnoseusb + libutil + libzip + mdns + boringcrypto, '-lz -lcrypto -lpthread -lusb-1.0')
-
-
-fastbootfiles = %w(
-  bootimg_utils.cpp
-  fs.cpp
-  socket.cpp
-  tcp.cpp
-  udp.cpp
-  usb_linux.cpp
-  util.cpp
-  main.cpp
-  engine.cpp
-  fastboot.cpp
-  fastboot_driver.cpp
-)
-libfastboot = compile(expand('core/fastboot', fastbootfiles), '-DFASTBOOT_VERSION="\"$PKGVER\"" -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -DUSE_F2FS -Icore/base/include -Icore/include -Icore/adb -Icore/libsparse/include -Icore/mkbootimg/include/bootimg -Icore/libziparchive/include -Icore/diagnose_usb/include')
-
-sparsefiles = %w(
-  backed_block.cpp
-  output_file.cpp
-  sparse.cpp
-  sparse_crc32.cpp
-  sparse_err.cpp
-  sparse_read.cpp
-)
-libsparse = compile(expand('core/libsparse', sparsefiles), '-Icore/libsparse/include -Icore/base/include')
-
-link('fastboot', libsparse + libzip + libcutils + liblog + libutil + libbase + libfastboot + libdiagnoseusb, '-lz -lpcre2-8 -lpthread -ldl')
-
-simg2imgfiles = %w(
-  simg2img.cpp
-)
-libsimg2img = compile(expand('core/libsparse', simg2imgfiles), '-Iinclude -Icore/libsparse/include')
-link('simg2img', libbase + libsparse + libsimg2img, '-lz')
-
-img2simgfiles = %w(
-  img2simg.cpp
-)
-libimg2simg = compile(expand('core/libsparse', img2simgfiles), '-Iinclude -Icore/libsparse/include')
-link('img2simg', libbase + libsparse + libimg2simg, '-lz')
-