Update to 35.0.1

This commit is contained in:
Robert-André Mauchin 2024-05-06 07:37:14 +02:00
commit 44e2b82d36
3 changed files with 4 additions and 39 deletions

View file

@ -1,34 +0,0 @@
diff -up android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp.include android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp
--- android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp.include 2023-09-03 07:06:16.000000000 -0600
+++ android-tools-34.0.4/vendor/adb/client/incremental_utils.cpp 2024-02-27 19:25:25.026823079 -0700
@@ -24,6 +24,7 @@
#include <ziparchive/zip_archive.h>
#include <ziparchive/zip_writer.h>
+#include <algorithm>
#include <array>
#include <cinttypes>
#include <numeric>
diff -up android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp.include android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp
--- android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp.include 2023-09-03 07:06:37.000000000 -0600
+++ android-tools-34.0.4/vendor/core/fs_mgr/liblp/super_layout_builder.cpp 2024-02-27 19:31:26.527846061 -0700
@@ -17,6 +17,8 @@
#include <liblp/liblp.h>
+#include <algorithm>
+
#include "images.h"
#include "utility.h"
#include "writer.h"
diff -up android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp.include android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp
--- android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp.include 2023-09-03 07:06:37.000000000 -0600
+++ android-tools-34.0.4/vendor/core/fs_mgr/liblp/utility.cpp 2024-02-27 19:42:57.193703638 -0700
@@ -25,6 +25,7 @@
#include <sys/ioctl.h>
#endif
+#include <algorithm>
#include <map>
#include <string>
#include <vector>

View file

@ -1,7 +1,7 @@
%global _hardened_build 1
Name: android-tools
Version: 34.0.4
Version: 35.0.1
Release: %autorelease
Epoch: 1
Summary: Android platform tools(adb, fastboot)
@ -14,9 +14,6 @@ URL: http://developer.android.com/guide/developing/tools/
Source0: https://github.com/nmeum/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
Source1: 51-android.rules
Source2: adb.service
# Fix includes
# https://github.com/nmeum/android-tools/commit/289759dfb6017c8f1ec1767d8922a7300c54ef05
Patch1: android-tools-include.patch
BuildRequires: brotli-devel
BuildRequires: cmake
@ -114,9 +111,11 @@ install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
%{_bindir}/lpflash
%{_bindir}/lpmake
%{_bindir}/lpunpack
%{_bindir}/make_f2fs
%{_bindir}/mkbootimg
%{_bindir}/mkdtboimg
%{_bindir}/repack_bootimg
%{_bindir}/sload_f2fs
%{_bindir}/unpack_bootimg
%{_datadir}/android-tools/completions/adb
%{_datadir}/android-tools/completions/fastboot

View file

@ -1 +1 @@
SHA512 (android-tools-34.0.4.tar.xz) = 34753bbbe9ed15ce0abc54c0fce4ecd69dc8b8db734169bd2473ac439d1c414301e798493b6b31cb00ed47d5314cabfb2c56d52dab0fe2a804125ebfbcbd18c5
SHA512 (android-tools-35.0.1.tar.xz) = 2dc3831f29a2c5ffc57978e4a6fa6d1469bcb0740750779b3e4f8239eaec87864f3474254a2d649ab630062be091d8b44a4e45c7e7b7e033f3b4481f81d76296