From e776a71ca2500f727f2f1ccf3c9ce46997f3954f Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Tue, 18 Jun 2024 05:59:59 +0000 Subject: [PATCH] vendor: Remove unused incremental_delivery submodule It was added in c036c4df45f080087858815910b0f1f93a3c7e29 commit and no longer required after removal of base submodule in 32559b1efec7f522d0b88a475b77ff91fdcd5699 commit. --- .gitmodules | 4 -- ...d-prototype-for-opreator-to-iterator.patch | 37 ------------------- vendor/CMakeLists.txt | 1 - vendor/incremental_delivery | 1 - 4 files changed, 43 deletions(-) delete mode 100644 patches/incremental_delivery/0001-Add-prototype-for-opreator-to-iterator.patch delete mode 160000 vendor/incremental_delivery diff --git a/.gitmodules b/.gitmodules index bef01cf..0fed469 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,10 +50,6 @@ shallow = true path = vendor/logging url = https://android.googlesource.com/platform/system/logging.git -[submodule "vendor/incremental_delivery"] - shallow = true - path = vendor/incremental_delivery - url = https://android.googlesource.com/platform/system/incremental_delivery [submodule "vendor/fmtlib"] shallow = true path = vendor/fmtlib diff --git a/patches/incremental_delivery/0001-Add-prototype-for-opreator-to-iterator.patch b/patches/incremental_delivery/0001-Add-prototype-for-opreator-to-iterator.patch deleted file mode 100644 index 6966452..0000000 --- a/patches/incremental_delivery/0001-Add-prototype-for-opreator-to-iterator.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8831613cd3cfe9a757909859f9e1e7500fef9ac8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Sun, 23 May 2021 21:08:49 +0200 -Subject: [PATCH] Add prototype for opreator-- to iterator - -Otherwise, g++ 10.X refuses to compile this code: - - In file included from /usr/include/c++/10.3.1/bits/stl_algobase.h:66, - from /usr/include/c++/10.3.1/memory:63, - from /home/soeren/src/android-tools/vendor/base/libs/androidfw/include/androidfw/LoadedArsc.h:20, - from /home/soeren/src/android-tools/vendor/base/libs/androidfw/LoadedArsc.cpp:19: - /usr/include/c++/10.3.1/bits/stl_iterator_base_funcs.h: In instantiation of 'constexpr void std::__advance(_RandomAccessIterator&, _Distance, std::random_access_iterator_tag) [with _RandomAccessIterator = android::incfs::map_ptr::const_iterator; _Distance = long int]': - /usr/include/c++/10.3.1/bits/stl_iterator_base_funcs.h:206:21: required from 'constexpr void std::advance(_InputIterator&, _Distance) [with _InputIterator = android::incfs::map_ptr::const_iterator; _Distance = long int]' - /usr/include/c++/10.3.1/bits/stl_algobase.h:1321:16: required from 'constexpr _ForwardIterator std::__lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&, _Compare) [with _ForwardIterator = android::incfs::map_ptr::const_iterator; _Tp = short unsigned int; _Compare = __gnu_cxx::__ops::_Iter_comp_val, uint16_t)::&, uint16_t)> >]' - /usr/include/c++/10.3.1/bits/stl_algo.h:2046:32: required from 'constexpr _FIter std::lower_bound(_FIter, _FIter, const _Tp&, _Compare) [with _FIter = android::incfs::map_ptr::const_iterator; _Tp = short unsigned int; _Compare = android::LoadedPackage::GetEntryOffset(android::incfs::verified_map_ptr, uint16_t)::&, uint16_t)>]' - /home/soeren/src/android-tools/vendor/base/libs/androidfw/LoadedArsc.cpp:276:6: required from here - /usr/include/c++/10.3.1/bits/stl_iterator_base_funcs.h:183:2: error: no match for 'operator--' (operand type is 'android::incfs::map_ptr::const_iterator') - 183 | --__i; - | ^~~~~ ---- - incfs/util/include/util/map_ptr.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/incfs/util/include/util/map_ptr.h b/incfs/util/include/util/map_ptr.h -index cda80f9..6fd38ee 100644 ---- a/incfs/util/include/util/map_ptr.h -+++ b/incfs/util/include/util/map_ptr.h -@@ -163,6 +163,9 @@ public: - - reference operator*() const { return safe_ptr_; } - -+ /* Prototype needed to make this compile with g++ for some reason */ -+ const const_iterator& operator--(); -+ - const const_iterator& operator++() { - safe_ptr_++; - return *this; diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 3cabf95..78c0e2a 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -55,7 +55,6 @@ set(android-vendored selinux f2fs-tools e2fsprogs - incremental_delivery fmtlib boringssl) diff --git a/vendor/incremental_delivery b/vendor/incremental_delivery deleted file mode 160000 index ab2cfbf..0000000 --- a/vendor/incremental_delivery +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ab2cfbf949aeaf042d66ca1c931f6f15164103c7