From f99f99e08a10623b7362fc51e835db93c1ab2ccb Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 6 May 2023 18:32:34 +0530 Subject: [PATCH 1/2] Upgrade to platform-tools-34.0.1 --- CMakeLists.txt | 2 +- .../0011-core-include-missing-headers.patch | 19 ++++++++++++++++--- ...he-internal-glibc-header-sys-cdefs.h.patch | 6 +++--- vendor/CMakeLists.fastboot.txt | 3 +++ vendor/adb | 2 +- vendor/avb | 2 +- vendor/base | 2 +- vendor/core | 2 +- vendor/e2fsprogs | 2 +- vendor/extras | 2 +- vendor/f2fs-tools | 2 +- vendor/logging | 2 +- vendor/native | 2 +- vendor/selinux | 2 +- 14 files changed, 33 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 796f6d5..9f73023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ set(ANDROID_MKE2FS_NAME "mke2fs.android") # Version of android-tools and the version of boringssl being used. # See: https://android.googlesource.com/platform/external/boringssl/+/platform-tools-${ANDROID_VERSION}/BORINGSSL_REVISION -set(ANDROID_VERSION 34.0.0) +set(ANDROID_VERSION 34.0.1) set(BORINGSSL_VERSION 1530333b25589ee4d4d52b10e78ee55dd82f6dcd) # Vendor string used in version outputs. diff --git a/patches/core/0011-core-include-missing-headers.patch b/patches/core/0011-core-include-missing-headers.patch index b3b12da..d8a5e86 100644 --- a/patches/core/0011-core-include-missing-headers.patch +++ b/patches/core/0011-core-include-missing-headers.patch @@ -1,12 +1,25 @@ -From 31d49215b221e6f7677c1983dc97a05640db3691 Mon Sep 17 00:00:00 2001 +From eedb7ce70d3fdbe0feaa9dd2aa657ab71f88454f Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 25 Feb 2023 15:13:29 +0530 Subject: [PATCH] core include missing headers --- + fastboot/fastboot.h | 1 + fastboot/super_flash_helper.cpp | 2 ++ - 1 file changed, 2 insertions(+) + 2 files changed, 3 insertions(+) +diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h +index b5fb8c0..bb238ed 100644 +--- a/fastboot/fastboot.h ++++ b/fastboot/fastboot.h +@@ -27,6 +27,7 @@ + */ + #pragma once + ++#include + #include + + #include diff --git a/fastboot/super_flash_helper.cpp b/fastboot/super_flash_helper.cpp index b617ce8..647b26f 100644 --- a/fastboot/super_flash_helper.cpp @@ -21,5 +34,5 @@ index b617ce8..647b26f 100644 using android::base::unique_fd; using android::fs_mgr::SuperImageExtent; -- -2.39.2 +2.40.1 diff --git a/patches/native/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/native/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch index cecbbc1..7c538fd 100644 --- a/patches/native/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch +++ b/patches/native/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch @@ -814,9 +814,9 @@ index 2a66941cef..fac80c0185 100644 +extern "C" { +#endif - /** - * This registers the service with the default service manager under this instance name. This does -@@ -267,4 +268,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31); + enum AServiceManager_AddServiceFlag : uint32_t { + /** +@@ -294,4 +295,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31); */ void AServiceManager_reRegister() __INTRODUCED_IN(31); diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt index 9594d21..f100fde 100644 --- a/vendor/CMakeLists.fastboot.txt +++ b/vendor/CMakeLists.fastboot.txt @@ -99,10 +99,13 @@ set(fastboot_SOURCES core/fastboot/bootimg_utils.cpp core/fastboot/fastboot.cpp core/fastboot/fastboot_driver.cpp + core/fastboot/filesystem.cpp core/fastboot/fs.cpp core/fastboot/main.cpp core/fastboot/socket.cpp + core/fastboot/storage.cpp core/fastboot/super_flash_helper.cpp + core/fastboot/task.cpp core/fastboot/tcp.cpp core/fastboot/udp.cpp core/fastboot/vendor_boot_img_utils.cpp diff --git a/vendor/adb b/vendor/adb index 33e2d1a..e8ac5a4 160000 --- a/vendor/adb +++ b/vendor/adb @@ -1 +1 @@ -Subproject commit 33e2d1afccc27777f69c33fca25f8fe2bfc77398 +Subproject commit e8ac5a47d72f733d88b69dfe7c798f5918bdff62 diff --git a/vendor/avb b/vendor/avb index c37a2cd..6f7b912 160000 --- a/vendor/avb +++ b/vendor/avb @@ -1 +1 @@ -Subproject commit c37a2cd92e242f8623f9c7f08731daa0694d354f +Subproject commit 6f7b9129295897376b5e1cef69404f72932a7925 diff --git a/vendor/base b/vendor/base index 38a6941..d383531 160000 --- a/vendor/base +++ b/vendor/base @@ -1 +1 @@ -Subproject commit 38a69419659dc35b7bb145655f484bc4d3305b36 +Subproject commit d38353176314e4e73c345b8404b199b6c5e2f5d6 diff --git a/vendor/core b/vendor/core index ddd2d0c..9b298de 160000 --- a/vendor/core +++ b/vendor/core @@ -1 +1 @@ -Subproject commit ddd2d0c28af9413aa0759ae0051be95932ba98c1 +Subproject commit 9b298decebebc088c2a33385efcd3f62705bca98 diff --git a/vendor/e2fsprogs b/vendor/e2fsprogs index e300778..3ca9015 160000 --- a/vendor/e2fsprogs +++ b/vendor/e2fsprogs @@ -1 +1 @@ -Subproject commit e300778742c0d81b5f9e068eb3dbdd6a37b51210 +Subproject commit 3ca9015ea15a795c7d2eec89f2d9d5f5131b264f diff --git a/vendor/extras b/vendor/extras index cad2894..26a85af 160000 --- a/vendor/extras +++ b/vendor/extras @@ -1 +1 @@ -Subproject commit cad28946959817b86b5678f4e1315e7e0cbb57dd +Subproject commit 26a85afddc6972ca3f14f1ef66799bab7df9779a diff --git a/vendor/f2fs-tools b/vendor/f2fs-tools index fbea230..57d4abe 160000 --- a/vendor/f2fs-tools +++ b/vendor/f2fs-tools @@ -1 +1 @@ -Subproject commit fbea230674ae48e1dd4e32128ca1b90764297019 +Subproject commit 57d4abe529f071b61e5d91d38c845787cb9dc967 diff --git a/vendor/logging b/vendor/logging index 152e478..cfbd2fb 160000 --- a/vendor/logging +++ b/vendor/logging @@ -1 +1 @@ -Subproject commit 152e478a9ec2567d27d475f4a6ef88632a27dfab +Subproject commit cfbd2fbb4717cb12efb866e73c754f063d02851c diff --git a/vendor/native b/vendor/native index 7ff29cb..42a51c7 160000 --- a/vendor/native +++ b/vendor/native @@ -1 +1 @@ -Subproject commit 7ff29cbd8ebc191e5eddcc912b7468314cc6e5b5 +Subproject commit 42a51c76bccddb958267418f71ab3259dd4795fe diff --git a/vendor/selinux b/vendor/selinux index 873d90e..cadcc8b 160000 --- a/vendor/selinux +++ b/vendor/selinux @@ -1 +1 @@ -Subproject commit 873d90e089f71cb4692805ecd9e18a55d632f99a +Subproject commit cadcc8b5a4b26d1f273f5d4e77490ca1c9541b41 From b581c01a82307fbcf37280366aa2aaaee37d2c4a Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Sat, 6 May 2023 20:09:03 +0530 Subject: [PATCH 2/2] Delete 0001-linux-types.h-seem-to-already-define-__bitwise.patch Upstream: misc: fix all the compiler warnings https://android.googlesource.com/platform/external/e2fsprogs.git/+/686994ebe274b20387ab901c2c4bd7d39c2ba742 --- ...s.h-seem-to-already-define-__bitwise.patch | 41 ------------------- 1 file changed, 41 deletions(-) delete mode 100644 patches/e2fsprogs/0001-linux-types.h-seem-to-already-define-__bitwise.patch diff --git a/patches/e2fsprogs/0001-linux-types.h-seem-to-already-define-__bitwise.patch b/patches/e2fsprogs/0001-linux-types.h-seem-to-already-define-__bitwise.patch deleted file mode 100644 index 488f919..0000000 --- a/patches/e2fsprogs/0001-linux-types.h-seem-to-already-define-__bitwise.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 620d340a086136b1222c841318c8cdf84c09c2c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Tue, 19 Jun 2018 12:44:59 +0000 -Subject: [PATCH] linux/types.h seem to already define __bitwise - -Thus #undef it before defining it again. ---- - lib/blkid/blkid_types.h | 4 ++++ - lib/ext2fs/ext2_types.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/lib/blkid/blkid_types.h b/lib/blkid/blkid_types.h -index 297a69da..b45eabb0 100644 ---- a/lib/blkid/blkid_types.h -+++ b/lib/blkid/blkid_types.h -@@ -23,6 +23,10 @@ typedef __signed__ long long __s64; - #ifndef EXT2_ENDIAN_H_ - #define EXT2_ENDIAN_H_ - -+/* __bitwise is already defined by linux/types.h */ -+#undef __bitwise -+#undef __force -+ - #ifdef __CHECKER__ - #ifndef __bitwise - #define __bitwise __attribute__((bitwise)) -diff --git a/lib/ext2fs/ext2_types.h b/lib/ext2fs/ext2_types.h -index 0e5ebe67..40dbd3f9 100644 ---- a/lib/ext2fs/ext2_types.h -+++ b/lib/ext2fs/ext2_types.h -@@ -23,6 +23,10 @@ typedef __signed__ long long __s64; - #ifndef EXT2_ENDIAN_H_ - #define EXT2_ENDIAN_H_ - -+/* __bitwise is already defined by linux/types.h */ -+#undef __bitwise -+#undef __force -+ - #ifdef __CHECKER__ - #ifndef __bitwise - #define __bitwise __attribute__((bitwise))