From 108d7724f14da323ecb9495cd87500f06ad0a3b5 Mon Sep 17 00:00:00 2001 From: Biswapriyo Nath Date: Wed, 24 Apr 2024 06:12:26 +0000 Subject: [PATCH] Upgrade to platform-tools-35.0.1 * adb/0025-Add-explicit-import-for-algorithm.patch https://android.googlesource.com/platform/packages/modules/adb.git/+/959eb4a096fc51bf2814e3374cb12b41d32a045d * base/0001-LoadedArsc-un-const-T-in-std-vector-T.patch https://android.googlesource.com/platform/frameworks/base/+/6e8c6039254716dca878e84567d3a4e480d47a22 * base/0002-PosixUtils-don-t-use-reserved-name-std-out-err-for-v.patch https://android.googlesource.com/platform/frameworks/base/+/faa5e27652dd889c95e2405bbeec8483ff7497c3 * base/0003-AssetManager2-Align-creation-of-FindEntryResult-with.patch https://android.googlesource.com/platform/frameworks/base/+/9e039b9dfecf25cbec1841651744baff3e9e34b8 --- CMakeLists.txt | 4 +- ...2-adb-disable-mdns-transport-support.patch | 7 +- ...25-Add-explicit-import-for-algorithm.patch | 26 -- ...oadedArsc-un-const-T-in-std-vector-T.patch | 26 -- ...-use-reserved-name-std-out-err-for-v.patch | 110 ++--- ...ign-creation-of-FindEntryResult-with.patch | 28 -- ...eLists.txt-Disable-Werror-by-default.patch | 11 +- ...he-internal-glibc-header-sys-cdefs.h.patch | 22 +- ...he-internal-glibc-header-sys-cdefs.h.patch | 12 +- ...he-internal-glibc-header-sys-cdefs.h.patch | 375 +++++++++++++----- vendor/CMakeLists.adb.txt | 3 + vendor/CMakeLists.fastboot.txt | 15 +- vendor/adb | 2 +- vendor/avb | 2 +- vendor/base | 2 +- vendor/boringssl | 2 +- vendor/core | 2 +- vendor/e2fsprogs | 2 +- vendor/extras | 2 +- vendor/f2fs-tools | 2 +- vendor/fmtlib | 2 +- vendor/incremental_delivery | 2 +- vendor/libbase | 2 +- vendor/libufdt | 2 +- vendor/libziparchive | 2 +- vendor/logging | 2 +- vendor/mkbootimg | 2 +- vendor/native | 2 +- vendor/selinux | 2 +- 29 files changed, 368 insertions(+), 305 deletions(-) delete mode 100644 patches/adb/0025-Add-explicit-import-for-algorithm.patch delete mode 100644 patches/base/0001-LoadedArsc-un-const-T-in-std-vector-T.patch delete mode 100644 patches/base/0003-AssetManager2-Align-creation-of-FindEntryResult-with.patch diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e1bc82..d3525a7 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.5) -set(BORINGSSL_VERSION e28988ecaa5e72523a982915084c9422e495116d) +set(ANDROID_VERSION 35.0.1) +set(BORINGSSL_VERSION 538b2a6cf0497cf8bb61ae726a484a3d7a34e54e) # Vendor string used in version outputs. set(ANDROID_VENDOR android-tools) diff --git a/patches/adb/0002-adb-disable-mdns-transport-support.patch b/patches/adb/0002-adb-disable-mdns-transport-support.patch index 017fb21..2807fc3 100644 --- a/patches/adb/0002-adb-disable-mdns-transport-support.patch +++ b/patches/adb/0002-adb-disable-mdns-transport-support.patch @@ -12,13 +12,14 @@ diff --git a/client/main.cpp b/client/main.cpp index 4fa58faf..c14b3463 100644 --- a/client/main.cpp +++ b/client/main.cpp -@@ -129,9 +129,6 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply +@@ -132,10 +132,6 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, const char* o + init_reconnect_handler(); - adb_wifi_init(); - if (!getenv("ADB_MDNS") || strcmp(getenv("ADB_MDNS"), "0") != 0) { - init_mdns_transport_discovery(); - } - +- if (!getenv("ADB_USB") || strcmp(getenv("ADB_USB"), "0") != 0) { if (should_use_libusb()) { + libusb::usb_init(); diff --git a/patches/adb/0025-Add-explicit-import-for-algorithm.patch b/patches/adb/0025-Add-explicit-import-for-algorithm.patch deleted file mode 100644 index 4c8b4bf..0000000 --- a/patches/adb/0025-Add-explicit-import-for-algorithm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 959eb4a096fc51bf2814e3374cb12b41d32a045d Mon Sep 17 00:00:00 2001 -From: Christopher Fore -Date: Mon, 20 Nov 2023 14:13:24 -0500 -Subject: [PATCH] adb: IWYU, include for std::remove_if - -GCC 14 starts to no longer include by default, resulting in -it needing to be explicitly declared. - -Test: Recompiled with GCC 14 and succeeded - -Change-Id: I1ff332284aa3b5dd38f882f9519269c9d370798c -Signed-off-by: Christopher Fore ---- - -diff --git a/client/incremental_utils.cpp b/client/incremental_utils.cpp -index 2f6958b..67f21a1 100644 ---- a/client/incremental_utils.cpp -+++ b/client/incremental_utils.cpp -@@ -24,6 +24,7 @@ - #include - #include - -+#include - #include - #include - #include diff --git a/patches/base/0001-LoadedArsc-un-const-T-in-std-vector-T.patch b/patches/base/0001-LoadedArsc-un-const-T-in-std-vector-T.patch deleted file mode 100644 index 83b3f8b..0000000 --- a/patches/base/0001-LoadedArsc-un-const-T-in-std-vector-T.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 90acd16bb50d45520dd57e28f3f047c566423342 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= - -Date: Sun, 1 Nov 2020 11:55:28 +0700 -Subject: [PATCH] LoadedArsc: un-const T in std::vector - -Despite that C++11 requires T as MoveAssignable, gcc 9.3.0 insists at -T must be non-const-volatile ---- - libs/androidfw/include/androidfw/LoadedArsc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/androidfw/include/androidfw/LoadedArsc.h b/libs/androidfw/include/androidfw/LoadedArsc.h -index b3d6a4dcb955..76e3e7f842ec 100644 ---- a/libs/androidfw/include/androidfw/LoadedArsc.h -+++ b/libs/androidfw/include/androidfw/LoadedArsc.h -@@ -295,7 +295,7 @@ class LoadedPackage { - std::unordered_map type_specs_; - ByteBucketArray resource_ids_; - std::vector dynamic_package_map_; -- std::vector>> overlayable_infos_; -+ std::vector>> overlayable_infos_; - std::map alias_id_map_; - - // A map of overlayable name to actor - diff --git a/patches/base/0002-PosixUtils-don-t-use-reserved-name-std-out-err-for-v.patch b/patches/base/0002-PosixUtils-don-t-use-reserved-name-std-out-err-for-v.patch index d32c567..f737baa 100644 --- a/patches/base/0002-PosixUtils-don-t-use-reserved-name-std-out-err-for-v.patch +++ b/patches/base/0002-PosixUtils-don-t-use-reserved-name-std-out-err-for-v.patch @@ -7,40 +7,51 @@ Subject: [PATCH] PosixUtils: don't use reserved name std{out,err} for musl's std{out,err} are macros. --- - libs/androidfw/PosixUtils.cpp | 40 +++++++++---------- - libs/androidfw/include/androidfw/PosixUtils.h | 4 +- - libs/androidfw/tests/PosixUtils_test.cpp | 4 +- - 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/libs/androidfw/PosixUtils.cpp b/libs/androidfw/PosixUtils.cpp -index 026912883a73..c01bfcd29eb8 100644 +index 8ddc5724..8dd1cd68 100644 --- a/libs/androidfw/PosixUtils.cpp +++ b/libs/androidfw/PosixUtils.cpp -@@ -50,17 +50,17 @@ namespace android { +@@ -46,17 +46,17 @@ namespace android { namespace util { - - std::unique_ptr ExecuteBinary(const std::vector& argv) { -- int stdout[2]; // stdout[0] read, stdout[1] write + + ProcResult ExecuteBinary(const std::vector& argv) { +- int stdout[2]; // [0] read, [1] write - if (pipe(stdout) != 0) { -+ int fdout[2]; // fdout[0] read, fdout[1] write ++ int fdout[2]; // [0] read, [1] write + if (pipe(fdout) != 0) { - PLOG(ERROR) << "pipe"; - return nullptr; + PLOG(ERROR) << "out pipe"; + return ProcResult{-1}; } - -- int stderr[2]; // stdout[0] read, stdout[1] write + +- int stderr[2]; // [0] read, [1] write - if (pipe(stderr) != 0) { -+ int fderr[2]; // fderr[0] read, fderr[1] write ++ int fderr[2]; // [0] read, [1] write + if (pipe(fderr) != 0) { - PLOG(ERROR) << "pipe"; + PLOG(ERROR) << "err pipe"; - close(stdout[0]); - close(stdout[1]); + close(fdout[0]); + close(fdout[1]); - return nullptr; + return ProcResult{-1}; } - -@@ -89,12 +89,12 @@ std::unique_ptr ExecuteBinary(const std::vector& argv) + +@@ -73,10 +73,10 @@ ProcResult ExecuteBinary(const std::vector& argv) { + switch (pid) { + case -1: // error + free(argv0); +- close(stdout[0]); +- close(stdout[1]); +- close(stderr[0]); +- close(stderr[1]); ++ close(fdout[0]); ++ close(fdout[1]); ++ close(fderr[0]); ++ close(fderr[1]); + PLOG(ERROR) << "fork"; + return ProcResult{-1}; + case 0: // child +@@ -90,12 +90,12 @@ ProcResult ExecuteBinary(const std::vector& argv) { exit(1); } @@ -57,7 +68,7 @@ index 026912883a73..c01bfcd29eb8 100644 abort(); } execvp(argv0[0], const_cast(argv0)); -@@ -102,23 +102,23 @@ std::unique_ptr ExecuteBinary(const std::vector& argv) +@@ -103,22 +103,22 @@ ProcResult ExecuteBinary(const std::vector& argv) { abort(); default: // parent free(argv0); @@ -72,58 +83,19 @@ index 026912883a73..c01bfcd29eb8 100644 - close(stderr[0]); + close(fdout[0]); + close(fderr[0]); - return nullptr; + return ProcResult{-1}; } - std::unique_ptr result(new ProcResult()); - result->status = status; -- const auto out = ReadFile(stdout[0]); -- result->stdout_str = out ? *out : ""; + ProcResult result(status); +- auto out = ReadFile(stdout[0]); ++ auto out = ReadFile(fdout[0]); + result.stdout_str = out ? std::move(*out) : ""; - close(stdout[0]); -- const auto err = ReadFile(stderr[0]); -- result->stderr_str = err ? *err : ""; -- close(stderr[0]); -+ const auto out = ReadFile(fdout[0]); -+ result->stdout_ = out ? *out : ""; +- auto err = ReadFile(stderr[0]); + close(fdout[0]); -+ const auto err = ReadFile(fderr[0]); -+ result->stderr_ = err ? *err : ""; ++ auto err = ReadFile(fderr[0]); + result.stderr_str = err ? std::move(*err) : ""; +- close(stderr[0]); + close(fderr[0]); - return result; + return std::move(result); } } -diff --git a/libs/androidfw/include/androidfw/PosixUtils.h b/libs/androidfw/include/androidfw/PosixUtils.h -index bb2084740a44..c6bb3fb42757 100644 ---- a/libs/androidfw/include/androidfw/PosixUtils.h -+++ b/libs/androidfw/include/androidfw/PosixUtils.h -@@ -23,8 +23,8 @@ namespace util { - - struct ProcResult { - int status; -- std::string stdout_str; -- std::string stderr_str; -+ std::string stdout_; -+ std::string stderr_; - }; - - // Fork, exec and wait for an external process. Return nullptr if the process could not be launched, -diff --git a/libs/androidfw/tests/PosixUtils_test.cpp b/libs/androidfw/tests/PosixUtils_test.cpp -index c7b3eba1451f..44816b279c1a 100644 ---- a/libs/androidfw/tests/PosixUtils_test.cpp -+++ b/libs/androidfw/tests/PosixUtils_test.cpp -@@ -30,14 +30,14 @@ TEST(PosixUtilsTest, AbsolutePathToBinary) { - const auto result = ExecuteBinary({"/bin/date", "--help"}); - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, 0); -- ASSERT_GE(result->stdout_str.find("usage: date "), 0); -+ ASSERT_GE(result->stdout_.find("usage: date "), 0); - } - - TEST(PosixUtilsTest, RelativePathToBinary) { - const auto result = ExecuteBinary({"date", "--help"}); - ASSERT_THAT(result, NotNull()); - ASSERT_EQ(result->status, 0); -- ASSERT_GE(result->stdout_str.find("usage: date "), 0); -+ ASSERT_GE(result->stdout_.find("usage: date "), 0); - } - - TEST(PosixUtilsTest, BadParameters) { diff --git a/patches/base/0003-AssetManager2-Align-creation-of-FindEntryResult-with.patch b/patches/base/0003-AssetManager2-Align-creation-of-FindEntryResult-with.patch deleted file mode 100644 index 5f6845e..0000000 --- a/patches/base/0003-AssetManager2-Align-creation-of-FindEntryResult-with.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f9634b82a18e4041971cdf8be2917eb5a27962b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Sun, 23 May 2021 13:36:29 +0200 -Subject: [PATCH] AssetManager2: Align creation of FindEntryResult with - declaration - -GCC 10.X complains about this and refuses to compile otherwise. ---- - libs/androidfw/AssetManager2.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libs/androidfw/AssetManager2.cpp b/libs/androidfw/AssetManager2.cpp -index bec80a7d605e..250032e12e4d 100644 ---- a/libs/androidfw/AssetManager2.cpp -+++ b/libs/androidfw/AssetManager2.cpp -@@ -821,11 +821,11 @@ base::expected AssetManager2::FindEntryInternal( - .entry = *entry, - .config = *best_config, - .type_flags = type_flags, -+ .dynamic_ref_table = package_group.dynamic_ref_table.get(), - .package_name = &best_package->GetPackageName(), - .type_string_ref = StringPoolRef(best_package->GetTypeStringPool(), best_type->id - 1), - .entry_string_ref = StringPoolRef(best_package->GetKeyStringPool(), - best_entry->key.index), -- .dynamic_ref_table = package_group.dynamic_ref_table.get(), - }; - } - 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 136cd20..e5a25ee 100644 --- a/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch +++ b/patches/boringssl/0012-CMakeLists.txt-Disable-Werror-by-default.patch @@ -14,15 +14,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1529526b..a393b7d7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -140,7 +140,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) +@@ -139,7 +139,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON) + 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. - # 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") +- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits -Wmissing-field-initializers") ++ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wwrite-strings -Wvla -Wshadow -Wtype-limits -Wmissing-field-initializers") 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 af8f426..44ce02b 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 @@ -516,24 +516,24 @@ index dbaeb93..0cc119c 100644 @@ -24,7 +23,9 @@ #include #include - + -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif - - static constexpr const char* CGROUPV2_CONTROLLER_NAME = "cgroup2"; - -@@ -38,7 +39,9 @@ bool SetTaskProfiles(int tid, const std::vector& profiles, bool use + + static constexpr const char* CGROUPV2_HIERARCHY_NAME = "cgroup2"; + [[deprecated]] static constexpr const char* CGROUPV2_CONTROLLER_NAME = "cgroup2"; +@@ -40,7 +41,9 @@ bool SetTaskProfiles(pid_t tid, const std::vector& profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles); bool SetUserProfiles(uid_t uid, const std::vector& profiles); - + -__END_DECLS +#ifdef __cplusplus +} +#endif - - bool SetTaskProfiles(int tid, std::initializer_list profiles, + + bool SetTaskProfiles(pid_t tid, std::initializer_list profiles, bool use_fd_cache = false); @@ -49,7 +52,9 @@ bool SetTaskProfiles(int tid, std::span profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, std::span profiles); @@ -878,13 +878,13 @@ index 16207e6..9a12458 100644 @@ -20,7 +20,9 @@ #include #include - + -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif - - const uint32_t TRUSTY_KEYMASTER_RECV_BUF_SIZE = 2 * PAGE_SIZE; + + const uint32_t TRUSTY_KEYMASTER_RECV_BUF_SIZE = 2 * 4096; const uint32_t TRUSTY_KEYMASTER_SEND_BUF_SIZE = @@ -35,6 +37,8 @@ keymaster_error_t translate_error(int err); keymaster_error_t trusty_keymaster_send(uint32_t command, const keymaster::Serializable& req, 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 4def701..13c88d5 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 @@ -186,10 +186,10 @@ index c0f62d39..5c759793 100644 #include #include -diff --git a/logd/libaudit.h b/logd/libaudit.h +diff --git a/logd/libaudit/include/libaudit.h b/logd/libaudit/include/libaudit.h index 27b08669..872d6996 100644 ---- a/logd/libaudit.h -+++ b/logd/libaudit.h +--- a/logd/libaudit/include/libaudit.h ++++ b/logd/libaudit/include/libaudit.h @@ -20,14 +20,15 @@ #pragma once @@ -208,10 +208,10 @@ index 27b08669..872d6996 100644 #define MAX_AUDIT_MESSAGE_LENGTH 8970 -@@ -100,4 +101,6 @@ extern int audit_setup(int fd, pid_t pid); +@@ -111,4 +112,6 @@ extern int audit_rate_limit(int fd, uint32_t limit); */ - extern int audit_rate_limit(int fd, uint32_t limit); - + extern int audit_log_android_avc_message(int fd, const char* msg); + -__END_DECLS +#ifdef __cplusplus +} 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 c5e5bcc..164458e 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 @@ -20,12 +20,16 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- include/android/font_matcher.h | 9 ++++++--- include/android/hardware_buffer_jni.h | 9 ++++++--- include/android/input.h | 1 - + include/android/looper.h | 1 - include/android/multinetwork.h | 9 ++++++--- include/android/native_window_jni.h | 1 - + include/android/performance_hint.h | 9 ++++++--- include/android/permission_manager.h | 9 ++++++--- + include/android/sensor.h | 1 - include/android/sharedmem.h | 1 - include/android/sharedmem_jni.h | 1 - include/android/surface_control.h | 9 ++++++--- + include/android/surface_control_jni.h | 9 ++++++--- include/android/surface_texture.h | 9 ++++++--- include/android/surface_texture_jni.h | 8 ++++++-- include/android/system_fonts.h | 9 ++++++--- @@ -34,12 +38,15 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- include/diskusage/dirsize.h | 8 ++++++-- include/private/performance_hint_private.h | 8 ++++++-- include/private/surface_control_private.h | 8 ++++++-- + include/private/thermal_private.h | 8 ++++++-- libs/adbd_auth/include/adbd_auth.h | 9 ++++++--- + .../ndk/include_cpp/android/persistable_bundle_aidl.h | 1 - libs/binder/ndk/include_ndk/android/binder_ibinder.h | 9 ++++++--- libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h | 8 ++++++-- libs/binder/ndk/include_ndk/android/binder_parcel.h | 9 ++++++--- libs/binder/ndk/include_ndk/android/binder_parcel_jni.h | 8 ++++++-- libs/binder/ndk/include_ndk/android/binder_status.h | 9 ++++++--- + libs/binder/ndk/include_ndk/android/persistable_bundle.h | 9 ++++++--- .../include_platform/android/binder_ibinder_platform.h | 8 ++++++-- .../binder/ndk/include_platform/android/binder_manager.h | 9 ++++++--- .../include_platform/android/binder_parcel_platform.h | 8 ++++++-- @@ -47,6 +54,8 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- libs/binder/ndk/include_platform/android/binder_shell.h | 8 ++++++-- .../ndk/include_platform/android/binder_stability.h | 8 ++++++-- libs/binder/ndk/parcel_internal.h | 1 - + libs/binder/ndk/persistable_bundle.cpp | 8 ++++++-- + libs/binder/trusty/ndk/include/sys/cdefs.h | 8 ++++++-- libs/nativebase/include/nativebase/nativebase.h | 9 ++++++--- libs/nativedisplay/include/apex/choreographer.h | 8 ++++++-- libs/nativedisplay/include/apex/display.h | 8 ++++++-- @@ -54,14 +63,14 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- .../include/surfacetexture/SurfaceTexture.h | 1 - libs/nativewindow/include/android/data_space.h | 9 ++++++--- libs/nativewindow/include/android/hardware_buffer.h | 9 ++++++--- + libs/nativewindow/include/android/hardware_buffer_aidl.h | 9 ++++++--- libs/nativewindow/include/android/hdr_metadata.h | 9 ++++++--- libs/nativewindow/include/android/native_window.h | 1 - + libs/nativewindow/include/android/native_window_aidl.h | 9 ++++++--- libs/nativewindow/include/apex/window.h | 8 ++++++-- libs/nativewindow/include/system/window.h | 9 ++++++--- libs/nativewindow/include/vndk/hardware_buffer.h | 8 ++++++-- libs/nativewindow/include/vndk/window.h | 8 ++++++-- - libs/vr/libdvr/dvr_buffer_queue_internal.h | 1 - - libs/vr/libdvr/dvr_internal.h | 1 - libs/vr/libdvr/include/dvr/dvr_buffer.h | 9 ++++++--- libs/vr/libdvr/include/dvr/dvr_buffer_queue.h | 9 ++++++--- libs/vr/libdvr/include/dvr/dvr_config.h | 9 ++++++--- @@ -76,10 +85,10 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- libs/vr/libdvr/include/dvr/dvr_tracking_types.h | 9 ++++++--- libs/vr/libdvr/include/dvr/dvr_vsync.h | 9 ++++++--- vulkan/include/hardware/hwvulkan.h | 8 ++++++-- - 64 files changed, 300 insertions(+), 146 deletions(-) + 73 files changed, 348 insertions(+), 168 deletions(-) diff --git a/docs/Doxyfile b/docs/Doxyfile -index ea22337f3f..d1e7d31d2b 100644 +index ea22337..d1e7d31 100644 --- a/docs/Doxyfile +++ b/docs/Doxyfile @@ -1623,8 +1623,12 @@ INCLUDE_FILE_PATTERNS = @@ -98,7 +107,7 @@ index ea22337f3f..d1e7d31d2b 100644 "__INTRODUCED_IN_32(x)=" \ "__INTRODUCED_IN_64(x)=" \ diff --git a/include/android/asset_manager.h b/include/android/asset_manager.h -index 2ac7d4d350..8a7517e4a0 100644 +index 2ac7d4d..8a7517e 100644 --- a/include/android/asset_manager.h +++ b/include/android/asset_manager.h @@ -26,7 +26,6 @@ @@ -110,7 +119,7 @@ index 2ac7d4d350..8a7517e4a0 100644 #ifdef __cplusplus diff --git a/include/android/choreographer.h b/include/android/choreographer.h -index cd8e63d..912c663 100644 +index f999708..06cf96b 100644 --- a/include/android/choreographer.h +++ b/include/android/choreographer.h @@ -49,9 +49,10 @@ @@ -126,7 +135,7 @@ index cd8e63d..912c663 100644 struct AChoreographer; /** -@@ -266,7 +267,9 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentationTime +@@ -279,7 +280,9 @@ int64_t AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentationTime int64_t AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos( const AChoreographerFrameCallbackData* data, size_t index) __INTRODUCED_IN(33); @@ -138,7 +147,7 @@ index cd8e63d..912c663 100644 #endif // ANDROID_CHOREOGRAPHER_H diff --git a/include/android/configuration.h b/include/android/configuration.h -index 88019ae054..dd28fa8b01 100644 +index 46c7dfe..b0c6392 100644 --- a/include/android/configuration.h +++ b/include/android/configuration.h @@ -26,7 +26,6 @@ @@ -150,18 +159,18 @@ index 88019ae054..dd28fa8b01 100644 #include diff --git a/include/android/font.h b/include/android/font.h -index 8a3a474f25..cda58a4a45 100644 +index 0225725..ca1113e 100644 --- a/include/android/font.h +++ b/include/android/font.h -@@ -31,7 +31,6 @@ - +@@ -32,7 +32,6 @@ #include #include + #include -#include /****************************************************************** * -@@ -49,7 +48,9 @@ +@@ -50,7 +49,9 @@ * - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES */ @@ -172,7 +181,7 @@ index 8a3a474f25..cda58a4a45 100644 enum { /** The minimum value fot the font weight value. */ -@@ -295,7 +296,9 @@ uint32_t AFont_getAxisTag(const AFont* _Nonnull font, uint32_t axisIndex) +@@ -297,7 +298,9 @@ uint32_t AFont_getAxisTag(const AFont* _Nonnull font, uint32_t axisIndex) float AFont_getAxisValue(const AFont* _Nonnull font, uint32_t axisIndex) __INTRODUCED_IN(29); @@ -184,18 +193,18 @@ index 8a3a474f25..cda58a4a45 100644 #endif // ANDROID_FONT_H diff --git a/include/android/font_matcher.h b/include/android/font_matcher.h -index 4417422687..bbb285e224 100644 +index 60ff95e..fdf047f 100644 --- a/include/android/font_matcher.h +++ b/include/android/font_matcher.h -@@ -75,7 +75,6 @@ - +@@ -76,7 +76,6 @@ #include #include + #include -#include #include -@@ -95,7 +94,9 @@ +@@ -96,7 +95,9 @@ * - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES */ @@ -206,7 +215,7 @@ index 4417422687..bbb285e224 100644 enum { /** A family variant value for the system default variant. */ -@@ -215,7 +216,9 @@ AFont* _Nonnull AFontMatcher_match( +@@ -217,7 +218,9 @@ AFont* _Nonnull AFontMatcher_match( const uint32_t textLength, uint32_t* _Nullable runLengthOut) __INTRODUCED_IN(29); @@ -218,7 +227,7 @@ index 4417422687..bbb285e224 100644 #endif // ANDROID_FONT_MATCHER_H diff --git a/include/android/hardware_buffer_jni.h b/include/android/hardware_buffer_jni.h -index ae208a6e75..7975fd4545 100644 +index ae208a6..7975fd4 100644 --- a/include/android/hardware_buffer_jni.h +++ b/include/android/hardware_buffer_jni.h @@ -27,13 +27,14 @@ @@ -250,7 +259,7 @@ index ae208a6e75..7975fd4545 100644 #endif // ANDROID_HARDWARE_BUFFER_JNI_H diff --git a/include/android/input.h b/include/android/input.h -index 76422154f1..450731f65c 100644 +index 16d86af..0951ec6 100644 --- a/include/android/input.h +++ b/include/android/input.h @@ -26,7 +26,6 @@ @@ -261,8 +270,20 @@ index 76422154f1..450731f65c 100644 /****************************************************************** * +diff --git a/include/android/looper.h b/include/android/looper.h +index e50730d..ea90edd 100644 +--- a/include/android/looper.h ++++ b/include/android/looper.h +@@ -26,7 +26,6 @@ + #ifndef ANDROID_LOOPER_H + #define ANDROID_LOOPER_H + +-#include + + #ifdef __cplusplus + extern "C" { diff --git a/include/android/multinetwork.h b/include/android/multinetwork.h -index 4c83a14728..823c7b48e0 100644 +index ee392fc..9b993a9 100644 --- a/include/android/multinetwork.h +++ b/include/android/multinetwork.h @@ -28,9 +28,10 @@ @@ -290,7 +311,7 @@ index 4c83a14728..823c7b48e0 100644 #endif // ANDROID_MULTINETWORK_H diff --git a/include/android/native_window_jni.h b/include/android/native_window_jni.h -index 071ec798b4..38e5cc6f97 100644 +index 071ec79..38e5cc6 100644 --- a/include/android/native_window_jni.h +++ b/include/android/native_window_jni.h @@ -26,7 +26,6 @@ @@ -302,10 +323,10 @@ index 071ec798b4..38e5cc6f97 100644 #include diff --git a/include/android/performance_hint.h b/include/android/performance_hint.h -index 5fa47f6..207dd5c 100644 +index 9d2c791..3653589 100644 --- a/include/android/performance_hint.h +++ b/include/android/performance_hint.h -@@ -17,7 +17,6 @@ +@@ -34,7 +34,6 @@ #ifndef ANDROID_NATIVE_PERFORMANCE_HINT_H #define ANDROID_NATIVE_PERFORMANCE_HINT_H @@ -313,9 +334,9 @@ index 5fa47f6..207dd5c 100644 /****************************************************************** * -@@ -38,7 +37,9 @@ - #include +@@ -56,7 +55,9 @@ #include + #include -__BEGIN_DECLS +#ifdef __cplusplus @@ -324,9 +345,9 @@ index 5fa47f6..207dd5c 100644 struct APerformanceHintManager; struct APerformanceHintSession; -@@ -159,6 +160,8 @@ int APerformanceHint_reportActualWorkDuration( - void APerformanceHint_closeSession( - APerformanceHintSession* session) __INTRODUCED_IN(__ANDROID_API_T__); +@@ -303,7 +304,9 @@ void AWorkDuration_setActualCpuDurationNanos(AWorkDuration* _Nonnull aWorkDurati + void AWorkDuration_setActualGpuDurationNanos(AWorkDuration* _Nonnull aWorkDuration, + int64_t actualGpuDurationNanos) __INTRODUCED_IN(__ANDROID_API_V__); -__END_DECLS +#ifdef __cplusplus @@ -334,6 +355,7 @@ index 5fa47f6..207dd5c 100644 +#endif #endif // ANDROID_NATIVE_PERFORMANCE_HINT_H + diff --git a/include/android/permission_manager.h b/include/android/permission_manager.h index 753b6d1..f815657 100644 --- a/include/android/permission_manager.h @@ -363,8 +385,20 @@ index 753b6d1..f815657 100644 #endif // ANDROID_PERMISSION_MANAGER_H +diff --git a/include/android/sensor.h b/include/android/sensor.h +index a618393..577e9cd 100644 +--- a/include/android/sensor.h ++++ b/include/android/sensor.h +@@ -29,7 +29,6 @@ + #ifndef ANDROID_SENSOR_H + #define ANDROID_SENSOR_H + +-#include + + /****************************************************************** + * diff --git a/include/android/sharedmem.h b/include/android/sharedmem.h -index e0a8045d41..4813279e80 100644 +index 1d513a6..ca84979 100644 --- a/include/android/sharedmem.h +++ b/include/android/sharedmem.h @@ -28,7 +28,6 @@ @@ -376,7 +410,7 @@ index e0a8045d41..4813279e80 100644 /****************************************************************** * diff --git a/include/android/sharedmem_jni.h b/include/android/sharedmem_jni.h -index bbac785a33..5abc245083 100644 +index bbac785..5abc245 100644 --- a/include/android/sharedmem_jni.h +++ b/include/android/sharedmem_jni.h @@ -30,7 +30,6 @@ @@ -388,7 +422,7 @@ index bbac785a33..5abc245083 100644 /****************************************************************** * diff --git a/include/android/surface_control.h b/include/android/surface_control.h -index 059bc41f9a..d4629955bf 100644 +index 23461e2..29ffcbc 100644 --- a/include/android/surface_control.h +++ b/include/android/surface_control.h @@ -26,7 +26,6 @@ @@ -410,7 +444,7 @@ index 059bc41f9a..d4629955bf 100644 struct ASurfaceControl; -@@ -615,7 +616,9 @@ void ASurfaceTransaction_setEnableBackPressure(ASurfaceTransaction* transaction, +@@ -699,7 +700,9 @@ void ASurfaceTransaction_setEnableBackPressure(ASurfaceTransaction* transaction, void ASurfaceTransaction_setFrameTimeline(ASurfaceTransaction* transaction, AVsyncId vsyncId) __INTRODUCED_IN(33); @@ -421,8 +455,38 @@ index 059bc41f9a..d4629955bf 100644 #endif // ANDROID_SURFACE_CONTROL_H +diff --git a/include/android/surface_control_jni.h b/include/android/surface_control_jni.h +index 840f6e7..2b4dbd9 100644 +--- a/include/android/surface_control_jni.h ++++ b/include/android/surface_control_jni.h +@@ -27,11 +27,12 @@ + #define ANDROID_SURFACE_CONTROL_JNI_H + + #include +-#include + + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /** + * Return the ASurfaceControl wrapped by a Java SurfaceControl object. +@@ -62,7 +63,9 @@ ASurfaceControl* _Nonnull ASurfaceControl_fromJava(JNIEnv* _Nonnull env, + ASurfaceTransaction* _Nonnull ASurfaceTransaction_fromJava(JNIEnv* _Nonnull env, + jobject _Nonnull transactionObj) __INTRODUCED_IN(__ANDROID_API_U__); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif // ANDROID_SURFACE_CONTROL_JNI_H + /** @} */ diff --git a/include/android/surface_texture.h b/include/android/surface_texture.h -index 9ae211ea14..da4ce54942 100644 +index 9ae211e..da4ce54 100644 --- a/include/android/surface_texture.h +++ b/include/android/surface_texture.h @@ -43,11 +43,12 @@ @@ -452,7 +516,7 @@ index 9ae211ea14..da4ce54942 100644 #endif /* ANDROID_NATIVE_SURFACE_TEXTURE_H */ diff --git a/include/android/surface_texture_jni.h b/include/android/surface_texture_jni.h -index 8448d8cafa..f1a75424c3 100644 +index 8448d8c..f1a7542 100644 --- a/include/android/surface_texture_jni.h +++ b/include/android/surface_texture_jni.h @@ -30,7 +30,9 @@ @@ -478,7 +542,7 @@ index 8448d8cafa..f1a75424c3 100644 #endif /* ANDROID_NATIVE_SURFACE_TEXTURE_JNI_H */ diff --git a/include/android/system_fonts.h b/include/android/system_fonts.h -index b0bbb954a9..2b43ff4083 100644 +index 94484ea..565fb49 100644 --- a/include/android/system_fonts.h +++ b/include/android/system_fonts.h @@ -65,7 +65,6 @@ @@ -498,9 +562,9 @@ index b0bbb954a9..2b43ff4083 100644 +extern "C" { +#endif + struct ASystemFontIterator; /** - * ASystemFontIterator provides access to the system font configuration. -@@ -126,7 +127,9 @@ void ASystemFontIterator_close(ASystemFontIterator* _Nullable iterator) __INTROD +@@ -127,7 +128,9 @@ void ASystemFontIterator_close(ASystemFontIterator* _Nullable iterator) __INTROD */ AFont* _Nullable ASystemFontIterator_next(ASystemFontIterator* _Nonnull iterator) __INTRODUCED_IN(29); @@ -512,7 +576,7 @@ index b0bbb954a9..2b43ff4083 100644 #endif // ANDROID_SYSTEM_FONTS_H diff --git a/include/android/thermal.h b/include/android/thermal.h -index 32580badc0..d7acbf09a6 100644 +index 0b57e93..1ae8add 100644 --- a/include/android/thermal.h +++ b/include/android/thermal.h @@ -26,7 +26,6 @@ @@ -524,7 +588,7 @@ index 32580badc0..d7acbf09a6 100644 /****************************************************************** * diff --git a/include/android/trace.h b/include/android/trace.h -index d11158bb74..d0d002d3dd 100644 +index d11158b..d0d002d 100644 --- a/include/android/trace.h +++ b/include/android/trace.h @@ -34,7 +34,6 @@ @@ -536,7 +600,7 @@ index d11158bb74..d0d002d3dd 100644 #ifdef __cplusplus extern "C" { diff --git a/include/diskusage/dirsize.h b/include/diskusage/dirsize.h -index 34236c0e6f..8500bd1a81 100644 +index 34236c0..8500bd1 100644 --- a/include/diskusage/dirsize.h +++ b/include/diskusage/dirsize.h @@ -20,11 +20,15 @@ @@ -558,12 +622,12 @@ index 34236c0e6f..8500bd1a81 100644 #endif /* __LIBDISKUSAGE_DIRSIZE_H */ diff --git a/include/private/performance_hint_private.h b/include/private/performance_hint_private.h -index 5832bf4..117b30b 100644 +index d50c5f8..262b062 100644 --- a/include/private/performance_hint_private.h +++ b/include/private/performance_hint_private.h -@@ -17,13 +17,17 @@ - #ifndef ANDROID_PRIVATE_NATIVE_PERFORMANCE_HINT_PRIVATE_H - #define ANDROID_PRIVATE_NATIVE_PERFORMANCE_HINT_PRIVATE_H +@@ -19,7 +19,9 @@ + + #include -__BEGIN_DECLS +#ifdef __cplusplus @@ -572,8 +636,9 @@ index 5832bf4..117b30b 100644 /** * For testing only. - */ - void APerformanceHint_setIHintManagerForTesting(void* iManager); +@@ -71,6 +73,8 @@ int APerformanceHint_sendHint(void* session, SessionHint hint); + int APerformanceHint_getThreadIds(void* aPerformanceHintSession, + int32_t* const threadIds, size_t* const size); -__END_DECLS +#ifdef __cplusplus @@ -582,12 +647,12 @@ index 5832bf4..117b30b 100644 #endif // ANDROID_PRIVATE_NATIVE_PERFORMANCE_HINT_PRIVATE_H diff --git a/include/private/surface_control_private.h b/include/private/surface_control_private.h -index 37a476e..542fd23 100644 +index 138926e..b9eede5 100644 --- a/include/private/surface_control_private.h +++ b/include/private/surface_control_private.h -@@ -19,7 +19,9 @@ +@@ -21,7 +21,9 @@ - #include + #include -__BEGIN_DECLS +#ifdef __cplusplus @@ -596,7 +661,7 @@ index 37a476e..542fd23 100644 struct ASurfaceControl; struct ASurfaceControlStats; -@@ -66,6 +68,8 @@ int64_t ASurfaceControlStats_getAcquireTime(ASurfaceControlStats* stats); +@@ -75,6 +77,8 @@ int64_t ASurfaceControlStats_getAcquireTime(ASurfaceControlStats* stats); */ uint64_t ASurfaceControlStats_getFrameNumber(ASurfaceControlStats* stats); @@ -606,8 +671,33 @@ index 37a476e..542fd23 100644 +#endif #endif //ANDROID_PRIVATE_NATIVE_SURFACE_CONTROL_H +diff --git a/include/private/thermal_private.h b/include/private/thermal_private.h +index 951d953..a53a93d 100644 +--- a/include/private/thermal_private.h ++++ b/include/private/thermal_private.h +@@ -19,13 +19,17 @@ + + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /** + * For testing only. + */ + void AThermal_setIThermalServiceForTesting(void* iThermalService); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif + + #endif // ANDROID_PRIVATE_NATIVE_THERMAL_H +\ No newline at end of file diff --git a/libs/adbd_auth/include/adbd_auth.h b/libs/adbd_auth/include/adbd_auth.h -index 1dcf540cf3..f5221c2fa7 100644 +index 1dcf540..f5221c2 100644 --- a/libs/adbd_auth/include/adbd_auth.h +++ b/libs/adbd_auth/include/adbd_auth.h @@ -18,14 +18,15 @@ @@ -636,8 +726,20 @@ index 1dcf540cf3..f5221c2fa7 100644 +#ifdef __cplusplus +} +#endif +diff --git a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h +index 864ff50..5222a01 100644 +--- a/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h ++++ b/libs/binder/ndk/include_cpp/android/persistable_bundle_aidl.h +@@ -17,7 +17,6 @@ + + #include + #include +-#include + + #include + #include diff --git a/libs/binder/ndk/include_ndk/android/binder_ibinder.h b/libs/binder/ndk/include_ndk/android/binder_ibinder.h -index 565542ba55..063e6f4c56 100644 +index b1ab7b0..5ee5393 100644 --- a/libs/binder/ndk/include_ndk/android/binder_ibinder.h +++ b/libs/binder/ndk/include_ndk/android/binder_ibinder.h @@ -28,13 +28,14 @@ @@ -657,7 +759,7 @@ index 565542ba55..063e6f4c56 100644 /** * Flags for AIBinder_transact. -@@ -822,6 +823,8 @@ AIBinder_Weak* AIBinder_Weak_clone(const AIBinder_Weak* weak) __INTRODUCED_IN(31 +@@ -828,6 +829,8 @@ AIBinder_Weak* AIBinder_Weak_clone(const AIBinder_Weak* weak) __INTRODUCED_IN(31 */ bool AIBinder_Weak_lt(const AIBinder_Weak* lhs, const AIBinder_Weak* rhs) __INTRODUCED_IN(31); @@ -668,7 +770,7 @@ index 565542ba55..063e6f4c56 100644 /** @} */ diff --git a/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h b/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h -index 6880d86e1a..1e35082649 100644 +index 8e288b3..d648139 100644 --- a/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h +++ b/libs/binder/ndk/include_ndk/android/binder_ibinder_jni.h @@ -30,7 +30,9 @@ @@ -693,7 +795,7 @@ index 6880d86e1a..1e35082649 100644 /** @} */ diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel.h b/libs/binder/ndk/include_ndk/android/binder_parcel.h -index 84575811f0..018672f4a0 100644 +index d833b83..d9d4fc6 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel.h @@ -29,13 +29,14 @@ @@ -724,7 +826,7 @@ index 84575811f0..018672f4a0 100644 /** @} */ diff --git a/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h b/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h -index 384d4f7772..e4d22d1d81 100644 +index 384d4f7..e4d22d1 100644 --- a/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h +++ b/libs/binder/ndk/include_ndk/android/binder_parcel_jni.h @@ -30,7 +30,9 @@ @@ -749,15 +851,20 @@ 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 4786c89..d8f4b1f 100644 +index 14edf2b..797ce58 100644 --- a/libs/binder/ndk/include_ndk/android/binder_status.h +++ b/libs/binder/ndk/include_ndk/android/binder_status.h -@@ -29,9 +29,10 @@ +@@ -29,14 +29,15 @@ #include #include #include -#include + #if !defined(__BIONIC__) && defined(BINDER_ENABLE_LIBLOG_ASSERT) + #include + #define __assert(file, line, message) LOG_ALWAYS_FATAL(file ":" #line ": " message) + #endif + -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { @@ -765,7 +872,7 @@ index 4786c89..d8f4b1f 100644 #ifndef __BIONIC__ -@@ -305,6 +306,8 @@ void AStatus_deleteDescription(const char* description) __INTRODUCED_IN(30); +@@ -310,6 +311,8 @@ void AStatus_deleteDescription(const char* description) __INTRODUCED_IN(30); */ void AStatus_delete(AStatus* status) __INTRODUCED_IN(29); @@ -775,8 +882,34 @@ index 4786c89..d8f4b1f 100644 +#endif /** @} */ +diff --git a/libs/binder/ndk/include_ndk/android/persistable_bundle.h b/libs/binder/ndk/include_ndk/android/persistable_bundle.h +index 98c0cb2..924007c 100644 +--- a/libs/binder/ndk/include_ndk/android/persistable_bundle.h ++++ b/libs/binder/ndk/include_ndk/android/persistable_bundle.h +@@ -19,10 +19,11 @@ + #include + #include + #include +-#include + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + /* + * A mapping from string keys to values of various types. +@@ -939,4 +940,6 @@ int32_t APersistableBundle_getPersistableBundleKeys( + int32_t bufferSizeBytes, APersistableBundle_stringAllocator stringAllocator, + void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__); + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif diff --git a/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h b/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h -index 89f21dda21..3cd8dcbd94 100644 +index 89f21dd..3cd8dcb 100644 --- a/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h +++ b/libs/binder/ndk/include_platform/android/binder_ibinder_platform.h @@ -18,7 +18,9 @@ @@ -799,7 +932,7 @@ index 89f21dda21..3cd8dcbd94 100644 +} +#endif diff --git a/libs/binder/ndk/include_platform/android/binder_manager.h b/libs/binder/ndk/include_platform/android/binder_manager.h -index 2a66941cef..fac80c0185 100644 +index a905dff..329fc6f 100644 --- a/libs/binder/ndk/include_platform/android/binder_manager.h +++ b/libs/binder/ndk/include_platform/android/binder_manager.h @@ -18,9 +18,10 @@ @@ -815,7 +948,7 @@ index 2a66941cef..fac80c0185 100644 enum AServiceManager_AddServiceFlag : uint32_t { /** -@@ -294,4 +295,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31); +@@ -308,4 +309,6 @@ bool AServiceManager_tryUnregister() __INTRODUCED_IN(31); */ void AServiceManager_reRegister() __INTRODUCED_IN(31); @@ -824,7 +957,7 @@ index 2a66941cef..fac80c0185 100644 +} +#endif diff --git a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h -index b24094ef16..cb6b7d88d9 100644 +index b24094e..cb6b7d8 100644 --- a/libs/binder/ndk/include_platform/android/binder_parcel_platform.h +++ b/libs/binder/ndk/include_platform/android/binder_parcel_platform.h @@ -18,7 +18,9 @@ @@ -847,7 +980,7 @@ index b24094ef16..cb6b7d88d9 100644 +} +#endif diff --git a/libs/binder/ndk/include_platform/android/binder_process.h b/libs/binder/ndk/include_platform/android/binder_process.h -index f408fadee0..985afca785 100644 +index 68528e1..1a8ec4f 100644 --- a/libs/binder/ndk/include_platform/android/binder_process.h +++ b/libs/binder/ndk/include_platform/android/binder_process.h @@ -17,11 +17,12 @@ @@ -874,7 +1007,7 @@ index f408fadee0..985afca785 100644 +} +#endif diff --git a/libs/binder/ndk/include_platform/android/binder_shell.h b/libs/binder/ndk/include_platform/android/binder_shell.h -index 07d89e67fc..5da5a7f1cd 100644 +index 07d89e6..5da5a7f 100644 --- a/libs/binder/ndk/include_platform/android/binder_shell.h +++ b/libs/binder/ndk/include_platform/android/binder_shell.h @@ -18,7 +18,9 @@ @@ -897,7 +1030,7 @@ index 07d89e67fc..5da5a7f1cd 100644 +} +#endif diff --git a/libs/binder/ndk/include_platform/android/binder_stability.h b/libs/binder/ndk/include_platform/android/binder_stability.h -index f113ba8f21..1203bd7d4d 100644 +index 089c775..f7f7fc7 100644 --- a/libs/binder/ndk/include_platform/android/binder_stability.h +++ b/libs/binder/ndk/include_platform/android/binder_stability.h @@ -18,7 +18,9 @@ @@ -910,8 +1043,8 @@ index f113ba8f21..1203bd7d4d 100644 +#endif /** - * Private addition to binder_flag_t. -@@ -121,4 +123,6 @@ __attribute__((weak)) + * Indicates that this transaction is coupled w/ vendor.img +@@ -119,4 +121,6 @@ __attribute__((weak)) #endif // defined(__ANDROID_MIN_SDK_VERSION__) && __ANDROID_MIN_SDK_VERSION__ < 30 void AIBinder_markVintfStability(AIBinder* binder); @@ -920,7 +1053,7 @@ index f113ba8f21..1203bd7d4d 100644 +} +#endif diff --git a/libs/binder/ndk/parcel_internal.h b/libs/binder/ndk/parcel_internal.h -index b4f6358841..98d3c8f590 100644 +index b4f6358..98d3c8f 100644 --- a/libs/binder/ndk/parcel_internal.h +++ b/libs/binder/ndk/parcel_internal.h @@ -18,7 +18,6 @@ @@ -931,6 +1064,29 @@ index b4f6358841..98d3c8f590 100644 #include #include "ibinder_internal.h" +diff --git a/libs/binder/ndk/persistable_bundle.cpp b/libs/binder/ndk/persistable_bundle.cpp +index 9b6877d..e7da1ac 100644 +--- a/libs/binder/ndk/persistable_bundle.cpp ++++ b/libs/binder/ndk/persistable_bundle.cpp +@@ -22,7 +22,9 @@ + + #include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + struct APersistableBundle { + APersistableBundle(const APersistableBundle& pBundle) : mPBundle(pBundle.mPBundle) {} +@@ -313,4 +315,6 @@ int32_t APersistableBundle_getPersistableBundleKeys( + stringAllocator, context); + } + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif diff --git a/libs/binder/trusty/ndk/include/sys/cdefs.h b/libs/binder/trusty/ndk/include/sys/cdefs.h index 6a48d2b..6e032d1 100644 --- a/libs/binder/trusty/ndk/include/sys/cdefs.h @@ -977,7 +1133,7 @@ index 7ecdfbd..3979b1b 100644 +} +#endif diff --git a/libs/nativedisplay/include/apex/choreographer.h b/libs/nativedisplay/include/apex/choreographer.h -index 683abc4142..cee6059214 100644 +index 683abc4..cee6059 100644 --- a/libs/nativedisplay/include/apex/choreographer.h +++ b/libs/nativedisplay/include/apex/choreographer.h @@ -19,7 +19,9 @@ @@ -1000,7 +1156,7 @@ index 683abc4142..cee6059214 100644 +} +#endif diff --git a/libs/nativedisplay/include/apex/display.h b/libs/nativedisplay/include/apex/display.h -index bd94b5523e..52b7ff915b 100644 +index 0f44902..19f0f35 100644 --- a/libs/nativedisplay/include/apex/display.h +++ b/libs/nativedisplay/include/apex/display.h @@ -23,7 +23,9 @@ @@ -1023,7 +1179,7 @@ index bd94b5523e..52b7ff915b 100644 +} +#endif diff --git a/libs/nativedisplay/include/surfacetexture/ImageConsumer.h b/libs/nativedisplay/include/surfacetexture/ImageConsumer.h -index 35ae3d2144..5023c4dccd 100644 +index 6fd4b8f..7b0e292 100644 --- a/libs/nativedisplay/include/surfacetexture/ImageConsumer.h +++ b/libs/nativedisplay/include/surfacetexture/ImageConsumer.h @@ -21,7 +21,6 @@ @@ -1035,24 +1191,24 @@ index 35ae3d2144..5023c4dccd 100644 namespace android { diff --git a/libs/nativedisplay/include/surfacetexture/SurfaceTexture.h b/libs/nativedisplay/include/surfacetexture/SurfaceTexture.h -index 6eaa84e225..9a5a976f0c 100644 +index 099f47d..2cf4060 100644 --- a/libs/nativedisplay/include/surfacetexture/SurfaceTexture.h +++ b/libs/nativedisplay/include/surfacetexture/SurfaceTexture.h -@@ -20,7 +20,6 @@ - #include +@@ -21,7 +21,6 @@ #include + #include -#include #include #include #include diff --git a/libs/nativewindow/include/android/data_space.h b/libs/nativewindow/include/android/data_space.h -index 968c114..dbfaac9 100644 +index 9f8ae86..626915f 100644 --- a/libs/nativewindow/include/android/data_space.h +++ b/libs/nativewindow/include/android/data_space.h -@@ -30,9 +30,10 @@ - +@@ -31,9 +31,10 @@ #include + #include -#include @@ -1063,8 +1219,8 @@ index 968c114..dbfaac9 100644 /** * ADataSpace. -@@ -558,7 +559,9 @@ enum ADataSpace { - DYNAMIC_DEPTH = 4098 +@@ -578,7 +579,9 @@ enum ADataSpace : int32_t { + ADATASPACE_DYNAMIC_DEPTH = 4098 }; -__END_DECLS @@ -1103,7 +1259,7 @@ index 21798d0..042358a 100644 #endif // ANDROID_HARDWARE_BUFFER_H diff --git a/libs/nativewindow/include/android/hardware_buffer_aidl.h b/libs/nativewindow/include/android/hardware_buffer_aidl.h -index e269f0d..185ed90 100644 +index 3f77c78..84c8a78 100644 --- a/libs/nativewindow/include/android/hardware_buffer_aidl.h +++ b/libs/nativewindow/include/android/hardware_buffer_aidl.h @@ -32,13 +32,14 @@ @@ -1135,7 +1291,7 @@ index e269f0d..185ed90 100644 // Only enable the AIDL glue helper if this is C++ #ifdef __cplusplus diff --git a/libs/nativewindow/include/android/hdr_metadata.h b/libs/nativewindow/include/android/hdr_metadata.h -index 88772a92fc..07b48e9588 100644 +index 88772a9..07b48e9 100644 --- a/libs/nativewindow/include/android/hdr_metadata.h +++ b/libs/nativewindow/include/android/hdr_metadata.h @@ -23,9 +23,10 @@ @@ -1162,7 +1318,7 @@ index 88772a92fc..07b48e9588 100644 #endif // ANDROID_HDR_METADATA_H diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h -index f0e1c4d749..5ab7fb35c4 100644 +index be6623e..122b716 100644 --- a/libs/nativewindow/include/android/native_window.h +++ b/libs/nativewindow/include/android/native_window.h @@ -35,7 +35,6 @@ @@ -1174,15 +1330,21 @@ index f0e1c4d749..5ab7fb35c4 100644 #include #include diff --git a/libs/nativewindow/include/android/native_window_aidl.h b/libs/nativewindow/include/android/native_window_aidl.h -index a252245..b74ae3b 100644 +index e496c45..fd152fd 100644 --- a/libs/nativewindow/include/android/native_window_aidl.h +++ b/libs/nativewindow/include/android/native_window_aidl.h -@@ -32,9 +32,10 @@ +@@ -32,7 +32,6 @@ #include #include -#include + // Only required by the AIDL glue helper + #ifdef __cplusplus +@@ -40,7 +39,9 @@ + #include + #endif // __cplusplus + -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { @@ -1190,7 +1352,7 @@ index a252245..b74ae3b 100644 /** * Read an ANativeWindow from a AParcel. The output buffer will have an -@@ -68,7 +69,9 @@ binder_status_t ANativeWindow_readFromParcel(const AParcel* _Nonnull parcel, +@@ -74,7 +75,9 @@ binder_status_t ANativeWindow_readFromParcel(const AParcel* _Nonnull parcel, binder_status_t ANativeWindow_writeToParcel(ANativeWindow* _Nonnull window, AParcel* _Nonnull parcel) __INTRODUCED_IN(__ANDROID_API_U__); @@ -1202,7 +1364,7 @@ index a252245..b74ae3b 100644 // Only enable the AIDL glue helper if this is C++ #ifdef __cplusplus diff --git a/libs/nativewindow/include/apex/window.h b/libs/nativewindow/include/apex/window.h -index 0923438eec..e4e51e912f 100644 +index 2d1354c..1b2f689 100644 --- a/libs/nativewindow/include/apex/window.h +++ b/libs/nativewindow/include/apex/window.h @@ -22,7 +22,9 @@ @@ -1225,7 +1387,7 @@ index 0923438eec..e4e51e912f 100644 +} +#endif diff --git a/libs/nativewindow/include/system/window.h b/libs/nativewindow/include/system/window.h -index 7f0113500d..75f97451ce 100644 +index a98ea86..3fab3e1 100644 --- a/libs/nativewindow/include/system/window.h +++ b/libs/nativewindow/include/system/window.h @@ -37,7 +37,6 @@ @@ -1247,7 +1409,7 @@ index 7f0113500d..75f97451ce 100644 /*****************************************************************************/ -@@ -1154,4 +1155,6 @@ static inline int ANativeWindow_setQueryInterceptor(ANativeWindow* window, +@@ -1276,4 +1277,6 @@ static inline int ANativeWindow_setQueryInterceptor(ANativeWindow* window, return window->perform(window, NATIVE_WINDOW_SET_QUERY_INTERCEPTOR, interceptor, data); } @@ -1256,7 +1418,7 @@ index 7f0113500d..75f97451ce 100644 +} +#endif diff --git a/libs/nativewindow/include/vndk/hardware_buffer.h b/libs/nativewindow/include/vndk/hardware_buffer.h -index 21931bb553..feda802ac3 100644 +index 21931bb..ac11524 100644 --- a/libs/nativewindow/include/vndk/hardware_buffer.h +++ b/libs/nativewindow/include/vndk/hardware_buffer.h @@ -22,7 +22,9 @@ @@ -1281,7 +1443,7 @@ index 21931bb553..feda802ac3 100644 #endif /* ANDROID_VNDK_NATIVEWINDOW_AHARDWAREBUFFER_H */ diff --git a/libs/nativewindow/include/vndk/window.h b/libs/nativewindow/include/vndk/window.h -index 500052c936..ebbb238367 100644 +index 500052c..db1fdd1 100644 --- a/libs/nativewindow/include/vndk/window.h +++ b/libs/nativewindow/include/vndk/window.h @@ -23,7 +23,9 @@ @@ -1306,7 +1468,7 @@ index 500052c936..ebbb238367 100644 #endif /* ANDROID_VNDK_NATIVEWINDOW_ANATIVEWINDOW_H */ diff --git a/libs/vr/libdvr/include/dvr/dvr_buffer.h b/libs/vr/libdvr/include/dvr/dvr_buffer.h -index 4234844c0f..8a34822998 100644 +index 4234844..8a34822 100644 --- a/libs/vr/libdvr/include/dvr/dvr_buffer.h +++ b/libs/vr/libdvr/include/dvr/dvr_buffer.h @@ -3,10 +3,11 @@ @@ -1334,7 +1496,7 @@ index 4234844c0f..8a34822998 100644 #endif // ANDROID_DVR_BUFFER_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_buffer_queue.h b/libs/vr/libdvr/include/dvr/dvr_buffer_queue.h -index ac789daf3d..9acf66e4cd 100644 +index ac789da..9acf66e 100644 --- a/libs/vr/libdvr/include/dvr/dvr_buffer_queue.h +++ b/libs/vr/libdvr/include/dvr/dvr_buffer_queue.h @@ -1,11 +1,12 @@ @@ -1363,7 +1525,7 @@ index ac789daf3d..9acf66e4cd 100644 #endif // ANDROID_DVR_BUFFER_QUEUE_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_config.h b/libs/vr/libdvr/include/dvr/dvr_config.h -index 3d2c0668da..3b94f1b8f8 100644 +index 3d2c066..3b94f1b 100644 --- a/libs/vr/libdvr/include/dvr/dvr_config.h +++ b/libs/vr/libdvr/include/dvr/dvr_config.h @@ -4,9 +4,10 @@ @@ -1390,7 +1552,7 @@ index 3d2c0668da..3b94f1b8f8 100644 #endif // ANDROID_DVR_CONFIG_H diff --git a/libs/vr/libdvr/include/dvr/dvr_configuration_data.h b/libs/vr/libdvr/include/dvr/dvr_configuration_data.h -index 22a509f6eb..efd148e243 100644 +index 22a509f..efd148e 100644 --- a/libs/vr/libdvr/include/dvr/dvr_configuration_data.h +++ b/libs/vr/libdvr/include/dvr/dvr_configuration_data.h @@ -4,12 +4,13 @@ @@ -1420,7 +1582,7 @@ index 22a509f6eb..efd148e243 100644 #endif // DVR_CONFIGURATION_DATA_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_deleter.h b/libs/vr/libdvr/include/dvr/dvr_deleter.h -index fe59d1ffba..5a9d93cf2d 100644 +index fe59d1f..5a9d93c 100644 --- a/libs/vr/libdvr/include/dvr/dvr_deleter.h +++ b/libs/vr/libdvr/include/dvr/dvr_deleter.h @@ -1,13 +1,14 @@ @@ -1482,7 +1644,7 @@ index f910d61..29ba986 100644 #endif // ANDROID_DVR_DISPLAY_MANAGER_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_display_types.h b/libs/vr/libdvr/include/dvr/dvr_display_types.h -index fd69843292..6e98383c38 100644 +index fd69843..6e98383 100644 --- a/libs/vr/libdvr/include/dvr/dvr_display_types.h +++ b/libs/vr/libdvr/include/dvr/dvr_display_types.h @@ -1,9 +1,10 @@ @@ -1509,7 +1671,7 @@ index fd69843292..6e98383c38 100644 #endif // ANDROID_DVR_DISPLAY_TYPES_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_performance.h b/libs/vr/libdvr/include/dvr/dvr_performance.h -index 5df35ad9d9..540f00574e 100644 +index 5df35ad..540f005 100644 --- a/libs/vr/libdvr/include/dvr/dvr_performance.h +++ b/libs/vr/libdvr/include/dvr/dvr_performance.h @@ -4,7 +4,9 @@ @@ -1535,7 +1697,7 @@ index 5df35ad9d9..540f00574e 100644 #endif // ANDROID_DVR_PERFORMANCE_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_pose.h b/libs/vr/libdvr/include/dvr/dvr_pose.h -index 87527515b4..51311709b1 100644 +index 8752751..5131170 100644 --- a/libs/vr/libdvr/include/dvr/dvr_pose.h +++ b/libs/vr/libdvr/include/dvr/dvr_pose.h @@ -2,9 +2,10 @@ @@ -1562,7 +1724,7 @@ index 87527515b4..51311709b1 100644 #endif // ANDROID_DVR_PUBLIC_POSE_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_surface.h b/libs/vr/libdvr/include/dvr/dvr_surface.h -index 74a68a16ee..0e615d2fe2 100644 +index 74a68a1..0e615d2 100644 --- a/libs/vr/libdvr/include/dvr/dvr_surface.h +++ b/libs/vr/libdvr/include/dvr/dvr_surface.h @@ -4,14 +4,15 @@ @@ -1594,7 +1756,7 @@ index 74a68a16ee..0e615d2fe2 100644 #endif // ANDROID_DVR_SURFACE_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_tracking.h b/libs/vr/libdvr/include/dvr/dvr_tracking.h -index 5e388f391a..bb4be60da3 100644 +index 5e388f3..bb4be60 100644 --- a/libs/vr/libdvr/include/dvr/dvr_tracking.h +++ b/libs/vr/libdvr/include/dvr/dvr_tracking.h @@ -2,11 +2,12 @@ @@ -1623,7 +1785,7 @@ index 5e388f391a..bb4be60da3 100644 #endif // ANDROID_DVR_TRACKING_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_tracking_types.h b/libs/vr/libdvr/include/dvr/dvr_tracking_types.h -index 81310d2303..8ee27bdf68 100644 +index 81310d2..8ee27bd 100644 --- a/libs/vr/libdvr/include/dvr/dvr_tracking_types.h +++ b/libs/vr/libdvr/include/dvr/dvr_tracking_types.h @@ -2,9 +2,10 @@ @@ -1650,7 +1812,7 @@ index 81310d2303..8ee27bdf68 100644 #endif // ANDROID_DVR_TRACKING_TYPES_H_ diff --git a/libs/vr/libdvr/include/dvr/dvr_vsync.h b/libs/vr/libdvr/include/dvr/dvr_vsync.h -index 498bb5cc6e..cd1a3f959c 100644 +index 498bb5c..cd1a3f9 100644 --- a/libs/vr/libdvr/include/dvr/dvr_vsync.h +++ b/libs/vr/libdvr/include/dvr/dvr_vsync.h @@ -2,9 +2,10 @@ @@ -1677,7 +1839,7 @@ index 498bb5cc6e..cd1a3f959c 100644 #endif // ANDROID_DVR_VSYNC_H_ diff --git a/vulkan/include/hardware/hwvulkan.h b/vulkan/include/hardware/hwvulkan.h -index 98bc8e3c46..0d5c4cf901 100644 +index 98bc8e3..0d5c4cf 100644 --- a/vulkan/include/hardware/hwvulkan.h +++ b/vulkan/include/hardware/hwvulkan.h @@ -20,7 +20,9 @@ @@ -1701,3 +1863,6 @@ index 98bc8e3c46..0d5c4cf901 100644 +#endif #endif // ANDROID_HWVULKAN_H +-- +2.44.0 + diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt index 84ad298..7f59783 100644 --- a/vendor/CMakeLists.adb.txt +++ b/vendor/CMakeLists.adb.txt @@ -1,5 +1,7 @@ protobuf_generate_cpp(ADB_APP_PROCESSES_PROTO_SRCS ADB_APP_PROCESSES_PROTO_HDRS adb/proto/app_processes.proto) +protobuf_generate_cpp(ADB_DEVCIES_PROTO_SRCS ADB_DEVICES_PROTO_HDRS + adb/proto/devices.proto) protobuf_generate_cpp(ADB_KEY_TYPE_PROTO_SRCS ADB_KEY_TYPE_PROTO_HDRS adb/proto/key_type.proto) protobuf_generate_cpp(ADB_KNOWN_HOSTS_PROTO_SRCS ADB_KNOWN_HOSTS_PROTO_HDRS @@ -33,6 +35,7 @@ set(libadb_SOURCES adb/sysdeps/errno.cpp adb/sysdeps/posix/network.cpp ${ADB_APP_PROCESSES_PROTO_SRCS} ${ADB_APP_PROCESSES_PROTO_HDRS} + ${ADB_DEVCIES_PROTO_SRCS} ${ADB_DEVICES_PROTO_HDRS} ${ADB_KNOWN_HOSTS_PROTO_SRCS} ${ADB_KNOWN_HOSTS_PROTO_HDRS} ${ADB_KEY_TYPE_PROTO_SRCS} ${ADB_KEY_TYPE_PROTO_HDRS} ${ADB_PAIRING_PROTO_SRCS} ${ADB_PAIRING_PROTO_HDRS}) diff --git a/vendor/CMakeLists.fastboot.txt b/vendor/CMakeLists.fastboot.txt index d81bcdb..83d9263 100644 --- a/vendor/CMakeLists.fastboot.txt +++ b/vendor/CMakeLists.fastboot.txt @@ -15,11 +15,16 @@ target_include_directories(libzip PUBLIC add_library(libutil STATIC core/libutils/FileMap.cpp - core/libutils/SharedBuffer.cpp - core/libutils/String16.cpp - core/libutils/String8.cpp - core/libutils/VectorImpl.cpp - core/libutils/Unicode.cpp) + core/libutils/JenkinsHash.cpp + core/libutils/LightRefBase.cpp + core/libutils/NativeHandle.cpp + core/libutils/Printer.cpp + core/libutils/StopWatch.cpp + core/libutils/SystemClock.cpp + core/libutils/Threads.cpp + core/libutils/Timers.cpp + core/libutils/Tokenizer.cpp + core/libutils/misc.cpp) target_include_directories(libutil PUBLIC core/include diff --git a/vendor/adb b/vendor/adb index efe5bfb..3f0d728 160000 --- a/vendor/adb +++ b/vendor/adb @@ -1 +1 @@ -Subproject commit efe5bfb75b5f34704806ba5f8f646cfac90d7210 +Subproject commit 3f0d728c0c39f24ca8afa2e65e642832119e2ba3 diff --git a/vendor/avb b/vendor/avb index 6798526..20e8b4c 160000 --- a/vendor/avb +++ b/vendor/avb @@ -1 +1 @@ -Subproject commit 679852611a3323efc39dc3c36e74655aba7761a2 +Subproject commit 20e8b4ca2a5c01ff054e896a49e2be2233a5303f diff --git a/vendor/base b/vendor/base index 211ebf1..48193c3 160000 --- a/vendor/base +++ b/vendor/base @@ -1 +1 @@ -Subproject commit 211ebf1318d828edbca2508f7c815ba371019e82 +Subproject commit 48193c3894410ad5f60e1c4b8ab7314be53f93fe diff --git a/vendor/boringssl b/vendor/boringssl index e28988e..538b2a6 160000 --- a/vendor/boringssl +++ b/vendor/boringssl @@ -1 +1 @@ -Subproject commit e28988ecaa5e72523a982915084c9422e495116d +Subproject commit 538b2a6cf0497cf8bb61ae726a484a3d7a34e54e diff --git a/vendor/core b/vendor/core index 63ee6fe..db5a18a 160000 --- a/vendor/core +++ b/vendor/core @@ -1 +1 @@ -Subproject commit 63ee6fea2f4a4fa86dae4f49fddaabea96104192 +Subproject commit db5a18a5fac8ac58177e87fc5e7e0033aa514aef diff --git a/vendor/e2fsprogs b/vendor/e2fsprogs index 39abf4e..028d97f 160000 --- a/vendor/e2fsprogs +++ b/vendor/e2fsprogs @@ -1 +1 @@ -Subproject commit 39abf4ed98a48f9bb32eb0a869adfab302d7cf9b +Subproject commit 028d97f1d1c2ea9816b279512326aca949fafe0a diff --git a/vendor/extras b/vendor/extras index 5b9b68b..f5a14a1 160000 --- a/vendor/extras +++ b/vendor/extras @@ -1 +1 @@ -Subproject commit 5b9b68bd93f544893eed4ee94dd4f3d3fae2fe61 +Subproject commit f5a14a11a6146cb9c3e2801737c23681478b607d diff --git a/vendor/f2fs-tools b/vendor/f2fs-tools index d231688..e20d15e 160000 --- a/vendor/f2fs-tools +++ b/vendor/f2fs-tools @@ -1 +1 @@ -Subproject commit d231688b35bb692034cc3009991455310b61fc70 +Subproject commit e20d15ee237ca4901b179a477f254b5d4501a410 diff --git a/vendor/fmtlib b/vendor/fmtlib index fa554bb..d419391 160000 --- a/vendor/fmtlib +++ b/vendor/fmtlib @@ -1 +1 @@ -Subproject commit fa554bb26552a53b4ace1c9a80962eb52acfdff6 +Subproject commit d419391dc911f385a0b0a46853223c364906b838 diff --git a/vendor/incremental_delivery b/vendor/incremental_delivery index 1cf3806..ab2cfbf 160000 --- a/vendor/incremental_delivery +++ b/vendor/incremental_delivery @@ -1 +1 @@ -Subproject commit 1cf38069b9a71a7a028ba6bdab8e54f57ef6d92a +Subproject commit ab2cfbf949aeaf042d66ca1c931f6f15164103c7 diff --git a/vendor/libbase b/vendor/libbase index 37276df..b243579 160000 --- a/vendor/libbase +++ b/vendor/libbase @@ -1 +1 @@ -Subproject commit 37276df36302f97cdf0dbbe5a5bd8d06c989bcf9 +Subproject commit b243579572671d62f3f24e38cf8d59c275358e9e diff --git a/vendor/libufdt b/vendor/libufdt index e77cb34..47c5588 160000 --- a/vendor/libufdt +++ b/vendor/libufdt @@ -1 +1 @@ -Subproject commit e77cb34780b0d26f6e067f8bb314d134c48b2bb7 +Subproject commit 47c5588db2a24e73ffd367a7626aceef05f1a6a9 diff --git a/vendor/libziparchive b/vendor/libziparchive index cf38765..94c11c9 160000 --- a/vendor/libziparchive +++ b/vendor/libziparchive @@ -1 +1 @@ -Subproject commit cf38765c81fee0c5a3f040e706e1e4ba8a8851f8 +Subproject commit 94c11c9d13fa3477f034c1af8621ca446e6f1550 diff --git a/vendor/logging b/vendor/logging index 569c8b1..90fafcf 160000 --- a/vendor/logging +++ b/vendor/logging @@ -1 +1 @@ -Subproject commit 569c8b1cf6dca57c28e933d852d36535e17c7c71 +Subproject commit 90fafcfd654ea1b9d023b11301ac5d3fdf8ff76c diff --git a/vendor/mkbootimg b/vendor/mkbootimg index 92b09b0..8c48c3c 160000 --- a/vendor/mkbootimg +++ b/vendor/mkbootimg @@ -1 +1 @@ -Subproject commit 92b09b0089b79e0c77f015bff5c7a4bcb1d862f9 +Subproject commit 8c48c3cb81a3f230d7e0a51c21653ffc2da7ce67 diff --git a/vendor/native b/vendor/native index 0ae6bbb..99e12d3 160000 --- a/vendor/native +++ b/vendor/native @@ -1 +1 @@ -Subproject commit 0ae6bbb1889ae56b291faf50667b006c12005e68 +Subproject commit 99e12d339e4fd28198601d7aafd1d16cb587dd9e diff --git a/vendor/selinux b/vendor/selinux index 05d686d..2af7683 160000 --- a/vendor/selinux +++ b/vendor/selinux @@ -1 +1 @@ -Subproject commit 05d686d98fa16ef0b8ba6a89c5806debd66edc16 +Subproject commit 2af7683b20a7de5264a2d788448b15f56ad6ee6f