diff --git a/CMakeLists.txt b/CMakeLists.txt index 62cdd0d..3e1bc82 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,8 +24,8 @@ 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.4) -set(BORINGSSL_VERSION 32b51305debe43e38e7bf2c2b13c4ebf3b474e80) +set(ANDROID_VERSION 34.0.5) +set(BORINGSSL_VERSION e28988ecaa5e72523a982915084c9422e495116d) # Vendor string used in version outputs. set(ANDROID_VENDOR android-tools) diff --git a/patches/adb/0003-adb-include-missing-headers.patch b/patches/adb/0003-adb-include-missing-headers.patch new file mode 100644 index 0000000..148fac3 --- /dev/null +++ b/patches/adb/0003-adb-include-missing-headers.patch @@ -0,0 +1,24 @@ +From c37bd188a394b36ecb5aa5eeac9469fc5ef4473a Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath +Date: Thu, 1 Feb 2024 19:39:48 +0530 +Subject: [PATCH] adb include missing headers + +--- + sysdeps/uio.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/sysdeps/uio.h b/sysdeps/uio.h +index f3ace64..266a20b 100644 +--- a/sysdeps/uio.h ++++ b/sysdeps/uio.h +@@ -34,6 +34,7 @@ ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt); + + #else + ++#include + #include + using adb_iovec = struct iovec; + inline ssize_t adb_writev(borrowed_fd fd, const adb_iovec* iov, int iovcnt) { +-- +2.43.0 + diff --git a/patches/adb/0024-Add-explicit-constructor-for-fdevent_event.patch b/patches/adb/0024-Add-explicit-constructor-for-fdevent_event.patch deleted file mode 100644 index a7f839c..0000000 --- a/patches/adb/0024-Add-explicit-constructor-for-fdevent_event.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c7bb7813905b5f879dc4c30cac1ee2a64852b8da Mon Sep 17 00:00:00 2001 -From: Matt Lee -Date: Tue, 16 May 2023 21:02:04 +0000 -Subject: [PATCH] Add explicit constructor for fdevent_event. - -Solution taken from comments on ag/23122419. - -Bug: 282860645 -Test: builds -Change-Id: I2a15d3f492d35cfe09f6173aac1f433f510f0f2e ---- - -diff --git a/fdevent/fdevent.h b/fdevent/fdevent.h -index 7f8e1a2..770e192 100644 ---- a/fdevent/fdevent.h -+++ b/fdevent/fdevent.h -@@ -51,6 +51,7 @@ - struct fdevent_event { - fdevent* fde; - unsigned events; -+ fdevent_event(fdevent* pfde, unsigned ev) : fde(pfde), events(ev) {} - }; - - struct fdevent final { diff --git a/patches/base/0004-Move-Theme-Entry-type-definition-up-before-it-is-use.patch b/patches/base/0004-Move-Theme-Entry-type-definition-up-before-it-is-use.patch deleted file mode 100644 index 1604e86..0000000 --- a/patches/base/0004-Move-Theme-Entry-type-definition-up-before-it-is-use.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 43fe09b8ca54e9a38dbd1451796299cc9299635f Mon Sep 17 00:00:00 2001 -From: Anatol Pomozov -Date: Thu, 22 Sep 2022 10:13:05 -0700 -Subject: [PATCH] Move Theme::Entry type definition up, before it is used - -This helps to fix clang compile error caused by forward declaration -type usage. It tested with Clang 14 at Arch Linux. - -What is interesting is GCC 12 does not need this patch. It looks like it -can figure out the forward declaration by itself. - -ome/anatol/sources/android-tools/vendor/base/libs/androidfw/AssetManager2.cpp -In file included from /home/anatol/sources/android-tools/vendor/base/libs/androidfw/AssetManager2.cpp:19: -In file included from /home/anatol/sources/android-tools/vendor/base/libs/androidfw/include/androidfw/AssetManager2.h:27: -In file included from /home/anatol/sources/android-tools/vendor/base/libs/androidfw/include/androidfw/ApkAssets.h:26: -In file included from /home/anatol/sources/android-tools/vendor/base/libs/androidfw/include/androidfw/Asset.h:30: -In file included from /home/anatol/sources/android-tools/vendor/incremental_delivery/incfs/util/include/util/map_ptr.h:19: -In file included from /home/anatol/sources/android-tools/vendor/libbase/include/android-base/logging.h:65: -In file included from /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../include/c++/12.2.0/functional:62: -In file included from /usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../include/c++/12.2.0/vector:64: -/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../include/c++/12.2.0/bits/stl_vector.h:1917:54: error: invalid application of 'sizeof' to an incomplete type 'android::Theme::Entry' - = __gnu_cxx::__numeric_traits::__max / sizeof(_Tp); - ^~~~~~~~~~~ -/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../include/c++/12.2.0/bits/stl_vector.h:994:16: note: in instantiation of member function 'std::vector::_S_max_size' requested here - { return _S_max_size(_M_get_Tp_allocator()); } - ^ -/usr/bin/../lib64/gcc/x86_64-pc-linux-gnu/12.2.0/../../../../include/c++/12.2.0/bits/vector.tcc:70:23: note: in instantiation of member function 'std::vector::max_size' requested here - if (__n > this->max_size()) - ^ -/home/anatol/sources/android-tools/vendor/base/libs/androidfw/AssetManager2.cpp:1350:19: note: in instantiation of member function 'std::vector::reserve' requested here - theme->entries_.reserve(kInitialReserveSize); - ^ -/home/anatol/sources/android-tools/vendor/base/libs/androidfw/include/androidfw/AssetManager2.h:554:10: note: forward declaration of 'android::Theme::Entry' - struct Entry; - ^ ---- - libs/androidfw/AssetManager2.cpp | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp -index 8896a03e3a29..65e50d028b63 100644 ---- a/libs/androidfw/AssetManager2.cpp -+++ b/libs/androidfw/AssetManager2.cpp -@@ -1344,6 +1344,13 @@ uint8_t AssetManager2::GetAssignedPackageId(const LoadedPackage* package) const - return 0; - } - -+struct Theme::Entry { -+ uint32_t attr_res_id; -+ ApkAssetsCookie cookie; -+ uint32_t type_spec_flags; -+ Res_value value; -+}; -+ - std::unique_ptr AssetManager2::NewTheme() { - constexpr size_t kInitialReserveSize = 32; - auto theme = std::unique_ptr(new Theme(this)); -@@ -1356,13 +1363,6 @@ Theme::Theme(AssetManager2* asset_manager) : asset_manager_(asset_manager) { - - Theme::~Theme() = default; - --struct Theme::Entry { -- uint32_t attr_res_id; -- ApkAssetsCookie cookie; -- uint32_t type_spec_flags; -- Res_value value; --}; -- - namespace { - struct ThemeEntryKeyComparer { - bool operator() (const Theme::Entry& entry, uint32_t attr_res_id) const noexcept { --- -2.37.3 - diff --git a/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch b/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch index 4a080e0..136cd20 100644 --- a/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch +++ b/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch @@ -11,18 +11,18 @@ to new warnings introduced by GCC upstream. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a1fb153..b9a3475 100644 +index 1529526b..a393b7d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -138,7 +138,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) - if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) +@@ -140,7 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) # Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration # primarily on our normal Clang one. -- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") -+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla -Wshadow -Wtype-limits") + # TODO(bbe) took out -Wmissing-field-initializers for pki - fix and put back or disable only for pki +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits") if(MSVC) # clang-cl sets different default warnings than clang. It also treats -Wall # as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall. --- +-- 2.40.1 diff --git a/patches/core/0009-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/core/0009-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch index f0a90c2..af8f426 100644 --- a/patches/core/0009-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch +++ b/patches/core/0009-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch @@ -64,10 +64,10 @@ index b7284b08ec..b85b6e542e 100644 #include diff --git a/debuggerd/include/debuggerd/handler.h b/debuggerd/include/debuggerd/handler.h -index bc08327a1c..c008b66f70 100644 +index ebb5372..07e3c1e 100644 --- a/debuggerd/include/debuggerd/handler.h +++ b/debuggerd/include/debuggerd/handler.h -@@ -20,11 +20,9 @@ +@@ -20,11 +20,12 @@ #include #include #include @@ -76,16 +76,22 @@ index bc08327a1c..c008b66f70 100644 #include -__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif // Forward declare these classes so not everyone has to include GWP-ASan // headers. -@@ -80,4 +78,3 @@ static void __attribute__((__unused__)) debuggerd_register_handlers(struct sigac +@@ -94,4 +95,6 @@ static void __attribute__((__unused__)) debuggerd_register_handlers(struct sigac sigaction(BIONIC_SIGNAL_DEBUGGER, action, nullptr); } -__END_DECLS ++#ifdef __cplusplus ++} ++#endif diff --git a/debuggerd/util.h b/debuggerd/util.h -index 43758702f2..58c0816802 100644 +index 4375870..58c0816 100644 --- a/debuggerd/util.h +++ b/debuggerd/util.h @@ -20,7 +20,6 @@ @@ -96,20 +102,8 @@ index 43758702f2..58c0816802 100644 #include std::vector get_command_line(pid_t pid); -diff --git a/fs_mgr/fs_mgr_priv_boot_config.h b/fs_mgr/fs_mgr_priv_boot_config.h -index 6a38401319..c081c3da2a 100644 ---- a/fs_mgr/fs_mgr_priv_boot_config.h -+++ b/fs_mgr/fs_mgr_priv_boot_config.h -@@ -17,7 +17,6 @@ - #ifndef __CORE_FS_MGR_PRIV_BOOTCONFIG_H - #define __CORE_FS_MGR_PRIV_BOOTCONFIG_H - --#include - #include - #include - #include diff --git a/init/keychords.cpp b/init/keychords.cpp -index adec383295..40e8524899 100644 +index adec383..40e8524 100644 --- a/init/keychords.cpp +++ b/init/keychords.cpp @@ -19,7 +19,6 @@ @@ -121,10 +115,10 @@ index adec383295..40e8524899 100644 #include #include diff --git a/init/reboot.cpp b/init/reboot.cpp -index 6aa9912e15..9431fcf6f2 100644 +index 3351c4c..3bf4518 100644 --- a/init/reboot.cpp +++ b/init/reboot.cpp -@@ -23,7 +23,6 @@ +@@ -24,7 +24,6 @@ #include #include #include @@ -133,7 +127,7 @@ index 6aa9912e15..9431fcf6f2 100644 #include #include diff --git a/libasyncio/include/asyncio/AsyncIO.h b/libasyncio/include/asyncio/AsyncIO.h -index 9620d2a843..005fc6648f 100644 +index 9620d2a..005fc66 100644 --- a/libasyncio/include/asyncio/AsyncIO.h +++ b/libasyncio/include/asyncio/AsyncIO.h @@ -20,7 +20,6 @@ @@ -145,23 +139,29 @@ index 9620d2a843..005fc6648f 100644 #include #include diff --git a/libcutils/android_get_control_env.h b/libcutils/android_get_control_env.h -index a830269183..125274cad8 100644 +index a830269..40edc2d 100644 --- a/libcutils/android_get_control_env.h +++ b/libcutils/android_get_control_env.h -@@ -16,11 +16,8 @@ +@@ -16,11 +16,14 @@ #pragma once -#include -__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif int __android_get_control_from_env(const char* prefix, const char* name) __attribute__((visibility("hidden"))); -__END_DECLS ++#ifdef __cplusplus ++} ++#endif diff --git a/libcutils/include/cutils/android_reboot.h b/libcutils/include/cutils/android_reboot.h -index 24e32d560a..56a31bc7a4 100644 +index 24e32d5..56a31bc 100644 --- a/libcutils/include/cutils/android_reboot.h +++ b/libcutils/include/cutils/android_reboot.h @@ -16,9 +16,10 @@ @@ -186,7 +186,7 @@ index 24e32d560a..56a31bc7a4 100644 +} +#endif diff --git a/libcutils/include/cutils/bitops.h b/libcutils/include/cutils/bitops.h -index 38d284039a..79193b5895 100644 +index 38d2840..79193b5 100644 --- a/libcutils/include/cutils/bitops.h +++ b/libcutils/include/cutils/bitops.h @@ -20,9 +20,10 @@ @@ -213,7 +213,7 @@ index 38d284039a..79193b5895 100644 #endif /* __CUTILS_BITOPS_H */ diff --git a/libcutils/include/cutils/klog.h b/libcutils/include/cutils/klog.h -index 5ae6216eb0..8006be7309 100644 +index 5ae6216..8006be7 100644 --- a/libcutils/include/cutils/klog.h +++ b/libcutils/include/cutils/klog.h @@ -17,11 +17,12 @@ @@ -243,7 +243,7 @@ index 5ae6216eb0..8006be7309 100644 #define KLOG_ERROR_LEVEL 3 #define KLOG_WARNING_LEVEL 4 diff --git a/libcutils/include/cutils/partition_utils.h b/libcutils/include/cutils/partition_utils.h -index 8bc9b48b30..ff1d13a064 100644 +index 8bc9b48..ff1d13a 100644 --- a/libcutils/include/cutils/partition_utils.h +++ b/libcutils/include/cutils/partition_utils.h @@ -17,12 +17,15 @@ @@ -266,7 +266,7 @@ index 8bc9b48b30..ff1d13a064 100644 #endif /* __CUTILS_PARTITION_WIPED_H__ */ diff --git a/libcutils/include/cutils/properties.h b/libcutils/include/cutils/properties.h -index 78d8bc6544..9f87212036 100644 +index 78d8bc6..9f87212 100644 --- a/libcutils/include/cutils/properties.h +++ b/libcutils/include/cutils/properties.h @@ -16,7 +16,6 @@ @@ -278,7 +278,7 @@ index 78d8bc6544..9f87212036 100644 #include diff --git a/libcutils/include/cutils/str_parms.h b/libcutils/include/cutils/str_parms.h -index aa1435a080..160792a372 100644 +index aa1435a..160792a 100644 --- a/libcutils/include/cutils/str_parms.h +++ b/libcutils/include/cutils/str_parms.h @@ -18,9 +18,10 @@ @@ -305,10 +305,10 @@ index aa1435a080..160792a372 100644 #endif /* __CUTILS_STR_PARMS_H */ diff --git a/libcutils/include/cutils/trace.h b/libcutils/include/cutils/trace.h -index ab2c64c2c5..c649e0d24f 100644 +index 7f57637..def5aeb 100644 --- a/libcutils/include/cutils/trace.h +++ b/libcutils/include/cutils/trace.h -@@ -27,12 +27,13 @@ using namespace std; +@@ -22,12 +22,13 @@ #include #include #include @@ -324,7 +324,7 @@ index ab2c64c2c5..c649e0d24f 100644 /** * The ATRACE_TAG macro can be defined before including this header to trace -@@ -272,6 +273,8 @@ static inline void atrace_int64(uint64_t tag, const char* name, int64_t value) +@@ -320,6 +321,8 @@ static inline void atrace_int64(uint64_t tag, const char* name, int64_t value) } } @@ -335,7 +335,7 @@ index ab2c64c2c5..c649e0d24f 100644 #endif // _LIBS_CUTILS_TRACE_H diff --git a/libcutils/include/private/canned_fs_config.h b/libcutils/include/private/canned_fs_config.h -index ad4de4ce6c..caf4b6186a 100644 +index ad4de4c..caf4b61 100644 --- a/libcutils/include/private/canned_fs_config.h +++ b/libcutils/include/private/canned_fs_config.h @@ -17,12 +17,15 @@ @@ -358,18 +358,16 @@ index ad4de4ce6c..caf4b6186a 100644 +} +#endif diff --git a/libcutils/include/private/fs_config.h b/libcutils/include/private/fs_config.h -index 8a9a1ffd77..40cb55f23a 100644 +index 45f46e5..b4ceade 100644 --- a/libcutils/include/private/fs_config.h +++ b/libcutils/include/private/fs_config.h -@@ -22,7 +22,6 @@ +@@ -22,13 +22,14 @@ #pragma once #include -#include - #if defined(__BIONIC__) #include -@@ -32,7 +31,9 @@ /* Rules for directories and files has moved to system/code/libcutils/fs_config.c */ @@ -380,7 +378,7 @@ index 8a9a1ffd77..40cb55f23a 100644 /* * Used in: -@@ -47,4 +48,6 @@ __BEGIN_DECLS +@@ -43,4 +44,6 @@ __BEGIN_DECLS void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid, unsigned* mode, uint64_t* capabilities); @@ -389,7 +387,7 @@ index 8a9a1ffd77..40cb55f23a 100644 +} +#endif diff --git a/libkeyutils/include/keyutils.h b/libkeyutils/include/keyutils.h -index c508f27902..2c3b4b0b12 100644 +index c508f27..2c3b4b0 100644 --- a/libkeyutils/include/keyutils.h +++ b/libkeyutils/include/keyutils.h @@ -31,9 +31,10 @@ @@ -416,7 +414,7 @@ index c508f27902..2c3b4b0b12 100644 #endif diff --git a/libnetutils/include/netutils/ifc.h b/libnetutils/include/netutils/ifc.h -index ee896ac086..3816f3371d 100644 +index ee896ac..3816f33 100644 --- a/libnetutils/include/netutils/ifc.h +++ b/libnetutils/include/netutils/ifc.h @@ -19,9 +19,10 @@ @@ -443,7 +441,7 @@ index ee896ac086..3816f3371d 100644 #endif /* _NETUTILS_IFC_H_ */ diff --git a/libpackagelistparser/include/packagelistparser/packagelistparser.h b/libpackagelistparser/include/packagelistparser/packagelistparser.h -index e89cb5400d..86b6604ca2 100644 +index e89cb54..86b6604 100644 --- a/libpackagelistparser/include/packagelistparser/packagelistparser.h +++ b/libpackagelistparser/include/packagelistparser/packagelistparser.h @@ -19,7 +19,9 @@ @@ -466,7 +464,7 @@ index e89cb5400d..86b6604ca2 100644 +} +#endif diff --git a/libprocessgroup/cgroup_map.h b/libprocessgroup/cgroup_map.h -index 5cdf8b28c0..322d4c4778 100644 +index 5cdf8b2..322d4c4 100644 --- a/libprocessgroup/cgroup_map.h +++ b/libprocessgroup/cgroup_map.h @@ -16,7 +16,6 @@ @@ -478,11 +476,14 @@ index 5cdf8b28c0..322d4c4778 100644 #include diff --git a/libprocessgroup/cgrouprc/include/android/cgrouprc.h b/libprocessgroup/cgrouprc/include/android/cgrouprc.h -index e704a36aac..39d9684d55 100644 +index e704a36..e65aa4a 100644 --- a/libprocessgroup/cgrouprc/include/android/cgrouprc.h +++ b/libprocessgroup/cgrouprc/include/android/cgrouprc.h -@@ -19,7 +19,9 @@ - #include +@@ -16,10 +16,11 @@ + + #pragma once + +-#include #include -__BEGIN_DECLS @@ -492,7 +493,7 @@ index e704a36aac..39d9684d55 100644 // For host builds, __INTRODUCED_IN is not defined. #ifndef __INTRODUCED_IN -@@ -92,4 +94,6 @@ __attribute__((warn_unused_result)) const char* ACgroupController_getName(const +@@ -92,4 +93,6 @@ __attribute__((warn_unused_result)) const char* ACgroupController_getName(const __attribute__((warn_unused_result)) const char* ACgroupController_getPath(const ACgroupController*) __INTRODUCED_IN(29); @@ -501,7 +502,7 @@ index e704a36aac..39d9684d55 100644 +} +#endif diff --git a/libprocessgroup/include/processgroup/processgroup.h b/libprocessgroup/include/processgroup/processgroup.h -index c5badc941f..8ecc416784 100644 +index dbaeb93..0cc119c 100644 --- a/libprocessgroup/include/processgroup/processgroup.h +++ b/libprocessgroup/include/processgroup/processgroup.h @@ -16,7 +16,6 @@ @@ -545,7 +546,7 @@ index c5badc941f..8ecc416784 100644 #ifndef __ANDROID_VNDK__ -@@ -98,4 +103,6 @@ bool getAttributePathForTask(const std::string& attr_name, int tid, std::string* +@@ -102,4 +107,6 @@ bool isProfileValidForProcess(const std::string& profile_name, int uid, int pid) #endif // __ANDROID_VNDK__ @@ -554,7 +555,7 @@ index c5badc941f..8ecc416784 100644 +} +#endif diff --git a/libprocessgroup/task_profiles.h b/libprocessgroup/task_profiles.h -index 9ee3781a62..f424483603 100644 +index 4663f64..bbba033 100644 --- a/libprocessgroup/task_profiles.h +++ b/libprocessgroup/task_profiles.h @@ -16,7 +16,6 @@ @@ -565,8 +566,33 @@ index 9ee3781a62..f424483603 100644 #include #include #include +diff --git a/libstats/push_compat/statsd_writer.h b/libstats/push_compat/statsd_writer.h +index f030b96..ffd38ea 100644 +--- a/libstats/push_compat/statsd_writer.h ++++ b/libstats/push_compat/statsd_writer.h +@@ -21,7 +21,9 @@ + #include + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /** + * Internal lock should not be exposed. This is bad design. +@@ -44,6 +46,8 @@ struct android_log_transport_write { + void (*noteDrop)(int error, int tag); + }; + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif // ANDROID_STATS_LOG_STATS_WRITER_H diff --git a/libsuspend/autosuspend_ops.h b/libsuspend/autosuspend_ops.h -index b0024c8bb2..ea0eafd00e 100644 +index b0024c8..ea0eafd 100644 --- a/libsuspend/autosuspend_ops.h +++ b/libsuspend/autosuspend_ops.h @@ -24,8 +24,12 @@ struct autosuspend_ops { @@ -585,7 +611,7 @@ index b0024c8bb2..ea0eafd00e 100644 #endif diff --git a/libsuspend/include/suspend/autosuspend.h b/libsuspend/include/suspend/autosuspend.h -index 21f4d61bf8..dbbca161c1 100644 +index 21f4d61..dbbca16 100644 --- a/libsuspend/include/suspend/autosuspend.h +++ b/libsuspend/include/suspend/autosuspend.h @@ -17,10 +17,11 @@ @@ -613,7 +639,7 @@ index 21f4d61bf8..dbbca161c1 100644 #endif diff --git a/libsync/include/android/sync.h b/libsync/include/android/sync.h -index 32bb878baa..59a8f9fadf 100644 +index 32bb878..59a8f9f 100644 --- a/libsync/include/android/sync.h +++ b/libsync/include/android/sync.h @@ -39,11 +39,15 @@ @@ -635,7 +661,7 @@ index 32bb878baa..59a8f9fadf 100644 #endif /* __SYS_CORE_SYNC_H */ diff --git a/libsync/include/ndk/sync.h b/libsync/include/ndk/sync.h -index 38ccb686c1..04c8e07adb 100644 +index 38ccb68..04c8e07 100644 --- a/libsync/include/ndk/sync.h +++ b/libsync/include/ndk/sync.h @@ -27,11 +27,12 @@ @@ -663,9 +689,9 @@ index 38ccb686c1..04c8e07adb 100644 +#endif #endif /* ANDROID_SYNC_H */ - + diff --git a/libsync/sw_sync.h b/libsync/sw_sync.h -index fda1c4c57c..395c38072c 100644 +index fda1c4c..395c380 100644 --- a/libsync/sw_sync.h +++ b/libsync/sw_sync.h @@ -19,7 +19,9 @@ @@ -690,7 +716,7 @@ index fda1c4c57c..395c38072c 100644 #endif /* __SYS_CORE_SW_SYNC_H */ diff --git a/libsystem/include/system/camera.h b/libsystem/include/system/camera.h -index 2ca90c395b..c42f559667 100644 +index 2ca90c3..c42f559 100644 --- a/libsystem/include/system/camera.h +++ b/libsystem/include/system/camera.h @@ -18,13 +18,14 @@ @@ -721,7 +747,7 @@ index 2ca90c395b..c42f559667 100644 #endif /* SYSTEM_CORE_INCLUDE_ANDROID_CAMERA_H */ diff --git a/libsystem/include/system/radio.h b/libsystem/include/system/radio.h -index acf3ea787a..dfd254fc6d 100644 +index acf3ea7..dfd254f 100644 --- a/libsystem/include/system/radio.h +++ b/libsystem/include/system/radio.h @@ -20,7 +20,6 @@ @@ -733,7 +759,7 @@ index acf3ea787a..dfd254fc6d 100644 diff --git a/libutils/Singleton_test.h b/libutils/Singleton_test.h -index c77d9ffe66..00bd56242c 100644 +index c77d9ff..00bd562 100644 --- a/libutils/Singleton_test.h +++ b/libutils/Singleton_test.h @@ -17,7 +17,6 @@ @@ -765,7 +791,7 @@ index c77d9ffe66..00bd56242c 100644 } diff --git a/llkd/include/llkd.h b/llkd/include/llkd.h -index 0822a3e2bf..a4e3037c18 100644 +index 0822a3e..a4e3037 100644 --- a/llkd/include/llkd.h +++ b/llkd/include/llkd.h @@ -22,9 +22,10 @@ @@ -812,7 +838,7 @@ index 0822a3e2bf..a4e3037c18 100644 /* clang-format off */ diff --git a/llkd/libllkd.cpp b/llkd/libllkd.cpp -index 42602e9ee0..ed348bb855 100644 +index 42602e9..ed348bb 100644 --- a/llkd/libllkd.cpp +++ b/llkd/libllkd.cpp @@ -25,7 +25,6 @@ @@ -824,7 +850,7 @@ index 42602e9ee0..ed348bb855 100644 #include #include // lstat() diff --git a/trusty/gatekeeper/trusty_gatekeeper_ipc.h b/trusty/gatekeeper/trusty_gatekeeper_ipc.h -index f8de7f8738..fa8fd40198 100644 +index f8de7f8..fa8fd40 100644 --- a/trusty/gatekeeper/trusty_gatekeeper_ipc.h +++ b/trusty/gatekeeper/trusty_gatekeeper_ipc.h @@ -14,11 +14,15 @@ @@ -846,7 +872,7 @@ index f8de7f8738..fa8fd40198 100644 +} +#endif diff --git a/trusty/keymaster/include/trusty_keymaster/ipc/trusty_keymaster_ipc.h b/trusty/keymaster/include/trusty_keymaster/ipc/trusty_keymaster_ipc.h -index 16207e6d98..9a1245886b 100644 +index 16207e6..9a12458 100644 --- a/trusty/keymaster/include/trusty_keymaster/ipc/trusty_keymaster_ipc.h +++ b/trusty/keymaster/include/trusty_keymaster/ipc/trusty_keymaster_ipc.h @@ -20,7 +20,9 @@ @@ -871,7 +897,7 @@ index 16207e6d98..9a1245886b 100644 #endif // TRUSTY_KEYMASTER_TRUSTY_KEYMASTER_IPC_H_ diff --git a/trusty/storage/lib/include/trusty/lib/storage.h b/trusty/storage/lib/include/trusty/lib/storage.h -index b8ddf67d87..6cac8750cd 100644 +index b8ddf67..6cac875 100644 --- a/trusty/storage/lib/include/trusty/lib/storage.h +++ b/trusty/storage/lib/include/trusty/lib/storage.h @@ -21,7 +21,9 @@ diff --git a/patches/core/0010-Correct-version-in-which-gettid-was-introduced-to-gl.patch b/patches/core/0010-Correct-version-in-which-gettid-was-introduced-to-gl.patch deleted file mode 100644 index 290dc17..0000000 --- a/patches/core/0010-Correct-version-in-which-gettid-was-introduced-to-gl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0950d4ac7ab12f3fc493e9e5b5e2e74154291bbd Mon Sep 17 00:00:00 2001 -From: munix9 <44939650+munix9@users.noreply.github.com> -Date: Mon, 5 Jul 2021 23:33:46 +0200 -Subject: [PATCH] Correct version in which gettid was introduced to glibc - ---- - libcutils/include/cutils/threads.h | 2 +- - libcutils/threads.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libcutils/include/cutils/threads.h b/libcutils/include/cutils/threads.h -index 0082c6c63..a85e12988 100644 ---- a/libcutils/include/cutils/threads.h -+++ b/libcutils/include/cutils/threads.h -@@ -31,7 +31,7 @@ extern "C" { - // - // Deprecated: use android::base::GetThreadId instead, which doesn't truncate on Mac/Windows. - // --#if !defined(__GLIBC__) || __GLIBC__ >= 2 && __GLIBC_MINOR__ < 32 -+#if !defined(__GLIBC__) || __GLIBC__ >= 2 && __GLIBC_MINOR__ < 31 - extern pid_t gettid(); - #endif - -diff --git a/libcutils/threads.cpp b/libcutils/threads.cpp -index 6ece7a3af..a15ff6aa3 100644 ---- a/libcutils/threads.cpp -+++ b/libcutils/threads.cpp -@@ -25,7 +25,7 @@ - #include - #endif - --#if defined(__BIONIC__) || defined(__GLIBC__) && __GLIBC_MINOR__ >= 32 -+#if defined(__BIONIC__) || defined(__GLIBC__) && __GLIBC_MINOR__ >= 31 - // No definition needed for Android because we'll just pick up bionic's copy. - // No definition needed for Glibc >= 2.32 because it exposes its own copy. - #else diff --git a/patches/core/0011-core-include-missing-headers.patch b/patches/core/0011-core-include-missing-headers.patch index d9c34ae..8008627 100644 --- a/patches/core/0011-core-include-missing-headers.patch +++ b/patches/core/0011-core-include-missing-headers.patch @@ -4,22 +4,9 @@ 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 ++ 4 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/fastboot/fastboot.h b/fastboot/fastboot.h -index b3dc67d..f946564 100644 ---- a/fastboot/fastboot.h -+++ b/fastboot/fastboot.h -@@ -27,6 +27,7 @@ - */ - #pragma once - -+#include - #include - #include "fastboot_driver.h" - #include "fastboot_driver_interface.h" diff --git a/fastboot/super_flash_helper.cpp b/fastboot/super_flash_helper.cpp index b617ce8..647b26f 100644 --- a/fastboot/super_flash_helper.cpp @@ -33,6 +20,19 @@ index b617ce8..647b26f 100644 using android::base::borrowed_fd; using android::base::unique_fd; using android::fs_mgr::SuperImageExtent; --- +diff --git a/fastboot/fastboot_driver_interface.h b/fastboot/fastboot_driver_interface.h +index 7cb8a6b..070c8b0 100644 +--- a/fastboot/fastboot_driver_interface.h ++++ b/fastboot/fastboot_driver_interface.h +@@ -15,6 +15,8 @@ + // + #pragma once + ++#include ++ + #include + + #include "android-base/unique_fd.h" +-- 2.40.1 diff --git a/patches/extras/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/extras/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch index 0f5b945..228c5d7 100644 --- a/patches/extras/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch +++ b/patches/extras/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch @@ -16,8 +16,39 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- tests/lib/testUtil/include/testUtil.h | 8 ++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) +diff --git a/libatrace_rust/benchmark/src/trace_enabler.h b/libatrace_rust/benchmark/src/trace_enabler.h +index 532c590..561ba6a 100644 +--- a/libatrace_rust/benchmark/src/trace_enabler.h ++++ b/libatrace_rust/benchmark/src/trace_enabler.h +@@ -16,13 +16,14 @@ + + #pragma once + +-#include + + // A library to enable tracing for benchmarks. + // It only causes ftrace events to be emitted so that we can measure + // performance and is not intended to enable tracing for meaningful results. + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + // Disable tracing for ATRACE_TAG_APP events. + // Terminates the app on error and writes an error message to logd and stderr. +@@ -33,4 +34,6 @@ void disable_app_atrace(); + // Terminates the app on error and writes an error message to logd and stderr. + void enable_atrace_for_single_app(const char* name); + +-__END_DECLS +\ No newline at end of file ++#ifdef __cplusplus ++} ++#endif +\ No newline at end of file diff --git a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h -index 26529b99..083999d5 100644 +index 26529b9..083999d 100644 --- a/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h +++ b/module_ndk_libs/libnativehelper/include/android/file_descriptor_jni.h @@ -25,7 +25,6 @@ diff --git a/patches/libziparchive/0002-fix-cxx-narrowing-error.patch b/patches/libziparchive/0002-fix-cxx-narrowing-error.patch deleted file mode 100644 index 9e9a9b1..0000000 --- a/patches/libziparchive/0002-fix-cxx-narrowing-error.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ca96ebc1cc16ae246e28c98f71e39d0d8b23243a Mon Sep 17 00:00:00 2001 -From: Biswapriyo Nath -Date: Wed, 15 Feb 2023 23:46:43 +0530 -Subject: [PATCH] fix cxx narrowing error - ---- - zip_archive.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zip_archive.cc b/zip_archive.cc -index e392a20..c5b5ae8 100644 ---- a/zip_archive.cc -+++ b/zip_archive.cc -@@ -1370,7 +1370,7 @@ bool Reader::IsZeroCopy() const { - } // namespace zip_archive - - static std::span bufferToSpan(zip_archive::Writer::Buffer buf) { -- return {buf.first, ssize_t(buf.second)}; -+ return {buf.first, size_t(buf.second)}; - } - - template --- -2.39.2 - diff --git a/patches/logging/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/logging/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch index c71b504..4def701 100644 --- a/patches/logging/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch +++ b/patches/logging/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch @@ -49,7 +49,7 @@ index 1bd1c8ae..c71bbdd4 100644 /* * Normally we strip the effects of ALOGV (VERBOSE messages), -@@ -377,4 +378,6 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int def +@@ -375,4 +376,6 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, int def #pragma clang diagnostic pop #endif @@ -139,10 +139,10 @@ index b784f9ff..88aeec9c 100644 +} +#endif diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp -index 084003e7..9eecf737 100644 +index c8fcf46..aff013e 100644 --- a/logcat/logcat.cpp +++ b/logcat/logcat.cpp -@@ -26,7 +26,6 @@ +@@ -29,7 +29,6 @@ #include #include #include @@ -151,10 +151,10 @@ index 084003e7..9eecf737 100644 #include #include diff --git a/logcat/tests/logcat_test.cpp b/logcat/tests/logcat_test.cpp -index b835bd5a..25cb94c5 100644 +index dc1df96..c26fe1b 100644 --- a/logcat/tests/logcat_test.cpp +++ b/logcat/tests/logcat_test.cpp -@@ -22,7 +22,6 @@ +@@ -24,7 +24,6 @@ #include #include #include 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 292fac9..c5e5bcc 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 @@ -110,10 +110,10 @@ index 2ac7d4d350..8a7517e4a0 100644 #ifdef __cplusplus diff --git a/include/android/choreographer.h b/include/android/choreographer.h -index b743f49..b52ab94 100644 +index cd8e63d..912c663 100644 --- a/include/android/choreographer.h +++ b/include/android/choreographer.h -@@ -27,9 +27,10 @@ +@@ -49,9 +49,10 @@ #define ANDROID_CHOREOGRAPHER_H #include @@ -749,10 +749,10 @@ index 384d4f7772..e4d22d1d81 100644 /** @} */ diff --git a/libs/binder/ndk/include_ndk/android/binder_status.h b/libs/binder/ndk/include_ndk/android/binder_status.h -index 76c7aacb7c..98c73aae07 100644 +index 4786c89..d8f4b1f 100644 --- a/libs/binder/ndk/include_ndk/android/binder_status.h +++ b/libs/binder/ndk/include_ndk/android/binder_status.h -@@ -28,9 +28,10 @@ +@@ -29,9 +29,10 @@ #include #include #include @@ -765,7 +765,7 @@ index 76c7aacb7c..98c73aae07 100644 #ifndef __BIONIC__ -@@ -304,6 +305,8 @@ void AStatus_deleteDescription(const char* description) __INTRODUCED_IN(30); +@@ -305,6 +306,8 @@ void AStatus_deleteDescription(const char* description) __INTRODUCED_IN(30); */ void AStatus_delete(AStatus* status) __INTRODUCED_IN(29); @@ -1047,35 +1047,35 @@ index 6eaa84e225..9a5a976f0c 100644 #include #include diff --git a/libs/nativewindow/include/android/data_space.h b/libs/nativewindow/include/android/data_space.h -index e759513a63..a15dc9c37d 100644 +index 968c114..dbfaac9 100644 --- a/libs/nativewindow/include/android/data_space.h +++ b/libs/nativewindow/include/android/data_space.h @@ -30,9 +30,10 @@ - + #include - + -#include - + -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif - + /** * ADataSpace. @@ -558,7 +559,9 @@ enum ADataSpace { DYNAMIC_DEPTH = 4098 }; - + -__END_DECLS +#ifdef __cplusplus +} +#endif - + #endif // ANDROID_DATA_SPACE_H - + diff --git a/libs/nativewindow/include/android/hardware_buffer.h b/libs/nativewindow/include/android/hardware_buffer.h -index 78c56d9ed5..aca4eacff6 100644 +index 21798d0..042358a 100644 --- a/libs/nativewindow/include/android/hardware_buffer.h +++ b/libs/nativewindow/include/android/hardware_buffer.h @@ -47,9 +47,10 @@ @@ -1091,7 +1091,7 @@ index 78c56d9ed5..aca4eacff6 100644 // clang-format off -@@ -575,7 +576,9 @@ int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* _Nonnull buffer, uint64_t us +@@ -614,7 +615,9 @@ int AHardwareBuffer_lockAndGetInfo(AHardwareBuffer* _Nonnull buffer, uint64_t us int AHardwareBuffer_getId(const AHardwareBuffer* _Nonnull buffer, uint64_t* _Nonnull outId) __INTRODUCED_IN(31); @@ -1123,7 +1123,7 @@ index e269f0d..185ed90 100644 /** * Read an AHardwareBuffer from a AParcel. The output buffer will have an -@@ -68,7 +69,9 @@ binder_status_t AHardwareBuffer_readFromParcel(const AParcel* _Nonnull parcel, +@@ -72,7 +73,9 @@ binder_status_t AHardwareBuffer_readFromParcel(const AParcel* _Nonnull parcel, binder_status_t AHardwareBuffer_writeToParcel(const AHardwareBuffer* _Nonnull buffer, AParcel* _Nonnull parcel) __INTRODUCED_IN(34); @@ -1216,7 +1216,7 @@ index 0923438eec..e4e51e912f 100644 /* * perform bits that can be used with ANativeWindow_perform() -@@ -220,4 +222,6 @@ int64_t ANativeWindow_getLastDequeueStartTime(ANativeWindow* window); +@@ -207,4 +209,6 @@ int64_t ANativeWindow_getLastDequeueStartTime(ANativeWindow* window); */ int ANativeWindow_setDequeueTimeout(ANativeWindow* window, int64_t timeout); @@ -1247,7 +1247,7 @@ index 7f0113500d..75f97451ce 100644 /*****************************************************************************/ -@@ -1131,4 +1132,6 @@ static inline int ANativeWindow_setQueryInterceptor(ANativeWindow* window, +@@ -1154,4 +1155,6 @@ static inline int ANativeWindow_setQueryInterceptor(ANativeWindow* window, return window->perform(window, NATIVE_WINDOW_SET_QUERY_INTERCEPTOR, interceptor, data); } @@ -1451,8 +1451,8 @@ index fe59d1ffba..5a9d93cf2d 100644 // Avoid errors if this header is included in C code. #if defined(__cplusplus) -ddiff --git a/libs/vr/libdvr/include/dvr/dvr_display_manager.h b/libs/vr/libdvr/include/dvr/dvr_display_manager.h -index f910d610f5..29ba986d26 100644 +diff --git a/libs/vr/libdvr/include/dvr/dvr_display_manager.h b/libs/vr/libdvr/include/dvr/dvr_display_manager.h +index f910d61..29ba986 100644 --- a/libs/vr/libdvr/include/dvr/dvr_display_manager.h +++ b/libs/vr/libdvr/include/dvr/dvr_display_manager.h @@ -4,12 +4,13 @@ diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt index fe556b1..84ad298 100644 --- a/vendor/CMakeLists.adb.txt +++ b/vendor/CMakeLists.adb.txt @@ -104,13 +104,11 @@ target_include_directories(liblog PUBLIC core/libcutils/include libbase/include) -add_library(libcutils STATIC +set(libcutils_SOURCES core/libcutils/android_get_control_file.cpp core/libcutils/ashmem-host.cpp - core/libcutils/canned_fs_config.cpp core/libcutils/config_utils.cpp core/libcutils/fs.cpp - core/libcutils/fs_config.cpp core/libcutils/hashmap.cpp core/libcutils/iosched_policy.cpp core/libcutils/load_file.cpp @@ -126,9 +124,15 @@ add_library(libcutils STATIC core/libcutils/sockets.cpp core/libcutils/str_parms.cpp core/libcutils/strlcpy.c - core/libcutils/trace-host.cpp - core/libcutils/threads.cpp) + core/libcutils/trace-host.cpp) +if (NOT APPLE AND NOT WIN32) + list(APPEND libcutils_SOURCES + core/libcutils/canned_fs_config.cpp + core/libcutils/fs_config.cpp) +endif() + +add_library(libcutils STATIC ${libcutils_SOURCES}) target_compile_definitions(libcutils PRIVATE -D_GNU_SOURCE) target_include_directories(libcutils PRIVATE logging/liblog/include core/libutils/include) diff --git a/vendor/CMakeLists.f2fstools.txt b/vendor/CMakeLists.f2fstools.txt index 7fdf640..b6e85ab 100644 --- a/vendor/CMakeLists.f2fstools.txt +++ b/vendor/CMakeLists.f2fstools.txt @@ -68,6 +68,6 @@ target_include_directories(sload_f2fs PRIVATE core/libcutils/include) target_link_libraries(sload_f2fs PRIVATE - libsparse libselinux libcutils z + libext2_uuid libsparse libselinux libcutils z PkgConfig::libpcre2-8 PkgConfig::liblz4) diff --git a/vendor/CMakeLists.libandroidfw.txt b/vendor/CMakeLists.libandroidfw.txt index 0fcebe7..2d2e3d9 100644 --- a/vendor/CMakeLists.libandroidfw.txt +++ b/vendor/CMakeLists.libandroidfw.txt @@ -26,6 +26,7 @@ target_compile_definitions(libandroidfw PUBLIC -DSTATIC_ANDROIDFW_FOR_TOOLS) target_compile_definitions(libandroidfw PRIVATE -D_GNU_SOURCE -DNDEBUG) target_include_directories(libandroidfw PUBLIC base/libs/androidfw/include + base/libs/androidfw/include_pathutils core/libcutils/include logging/liblog/include core/libsystem/include diff --git a/vendor/adb b/vendor/adb index cc4315a..efe5bfb 160000 --- a/vendor/adb +++ b/vendor/adb @@ -1 +1 @@ -Subproject commit cc4315a72cee5d4d331b0d18eaa6af57e06af47c +Subproject commit efe5bfb75b5f34704806ba5f8f646cfac90d7210 diff --git a/vendor/avb b/vendor/avb index b3899be..6798526 160000 --- a/vendor/avb +++ b/vendor/avb @@ -1 +1 @@ -Subproject commit b3899bede455ec190f330f3a9122f6edf5c6558f +Subproject commit 679852611a3323efc39dc3c36e74655aba7761a2 diff --git a/vendor/base b/vendor/base index 36f6322..211ebf1 160000 --- a/vendor/base +++ b/vendor/base @@ -1 +1 @@ -Subproject commit 36f632262e0873bed34c305c5f3d848a025ee1cc +Subproject commit 211ebf1318d828edbca2508f7c815ba371019e82 diff --git a/vendor/boringssl b/vendor/boringssl index 32b5130..e28988e 160000 --- a/vendor/boringssl +++ b/vendor/boringssl @@ -1 +1 @@ -Subproject commit 32b51305debe43e38e7bf2c2b13c4ebf3b474e80 +Subproject commit e28988ecaa5e72523a982915084c9422e495116d diff --git a/vendor/core b/vendor/core index 983c1f7..63ee6fe 160000 --- a/vendor/core +++ b/vendor/core @@ -1 +1 @@ -Subproject commit 983c1f710f85dd4e9197050b5d0260c8a209b742 +Subproject commit 63ee6fea2f4a4fa86dae4f49fddaabea96104192 diff --git a/vendor/extras b/vendor/extras index b57b519..5b9b68b 160000 --- a/vendor/extras +++ b/vendor/extras @@ -1 +1 @@ -Subproject commit b57b5191f1afce834f9194e278ddbda78e9d93df +Subproject commit 5b9b68bd93f544893eed4ee94dd4f3d3fae2fe61 diff --git a/vendor/f2fs-tools b/vendor/f2fs-tools index 114545e..d231688 160000 --- a/vendor/f2fs-tools +++ b/vendor/f2fs-tools @@ -1 +1 @@ -Subproject commit 114545e66bbb97f42ab49444209b0f0c50747145 +Subproject commit d231688b35bb692034cc3009991455310b61fc70 diff --git a/vendor/fmtlib b/vendor/fmtlib index 8641058..fa554bb 160000 --- a/vendor/fmtlib +++ b/vendor/fmtlib @@ -1 +1 @@ -Subproject commit 864105805c6646ef1588507531fb6d67431356b3 +Subproject commit fa554bb26552a53b4ace1c9a80962eb52acfdff6 diff --git a/vendor/incremental_delivery b/vendor/incremental_delivery index be87e9e..1cf3806 160000 --- a/vendor/incremental_delivery +++ b/vendor/incremental_delivery @@ -1 +1 @@ -Subproject commit be87e9e834303b90ec9cbf03fc802afe24bdaa51 +Subproject commit 1cf38069b9a71a7a028ba6bdab8e54f57ef6d92a diff --git a/vendor/libbase b/vendor/libbase index 97b4c11..37276df 160000 --- a/vendor/libbase +++ b/vendor/libbase @@ -1 +1 @@ -Subproject commit 97b4c11315588dfb7ff8168c232dde3f440e1825 +Subproject commit 37276df36302f97cdf0dbbe5a5bd8d06c989bcf9 diff --git a/vendor/libziparchive b/vendor/libziparchive index eaaeea4..cf38765 160000 --- a/vendor/libziparchive +++ b/vendor/libziparchive @@ -1 +1 @@ -Subproject commit eaaeea4c04d73d6ccf8027fc4ecc4a6213627ceb +Subproject commit cf38765c81fee0c5a3f040e706e1e4ba8a8851f8 diff --git a/vendor/logging b/vendor/logging index 75c8cc2..569c8b1 160000 --- a/vendor/logging +++ b/vendor/logging @@ -1 +1 @@ -Subproject commit 75c8cc2fb6599f36a4491c78d53cf2aec35cc357 +Subproject commit 569c8b1cf6dca57c28e933d852d36535e17c7c71 diff --git a/vendor/mkbootimg b/vendor/mkbootimg index 71b8e43..92b09b0 160000 --- a/vendor/mkbootimg +++ b/vendor/mkbootimg @@ -1 +1 @@ -Subproject commit 71b8e4317ee1dfe4c7ffe05af3eefb8bf49f4ae8 +Subproject commit 92b09b0089b79e0c77f015bff5c7a4bcb1d862f9 diff --git a/vendor/native b/vendor/native index d03f9ea..0ae6bbb 160000 --- a/vendor/native +++ b/vendor/native @@ -1 +1 @@ -Subproject commit d03f9ea6bdff2e3a7416af3bc454930a3ffd1c9c +Subproject commit 0ae6bbb1889ae56b291faf50667b006c12005e68 diff --git a/vendor/selinux b/vendor/selinux index 9495044..05d686d 160000 --- a/vendor/selinux +++ b/vendor/selinux @@ -1 +1 @@ -Subproject commit 9495044e23c5840d0496a55e16e753ff30656dbc +Subproject commit 05d686d98fa16ef0b8ba6a89c5806debd66edc16