diff --git a/CMakeLists.txt b/CMakeLists.txt index e7d947b..06faaf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,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 35.0.1) -set(BORINGSSL_VERSION 538b2a6cf0497cf8bb61ae726a484a3d7a34e54e) +set(ANDROID_VERSION 35.0.2) +set(BORINGSSL_VERSION 9cffd74fdb65c69506a0ce1b19420a67ad0cb19e) # 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 2807fc3..1365aa5 100644 --- a/patches/adb/0002-adb-disable-mdns-transport-support.patch +++ b/patches/adb/0002-adb-disable-mdns-transport-support.patch @@ -21,5 +21,5 @@ index 4fa58faf..c14b3463 100644 - } - if (!getenv("ADB_USB") || strcmp(getenv("ADB_USB"), "0") != 0) { - if (should_use_libusb()) { + if (is_libusb_enabled()) { libusb::usb_init(); diff --git a/patches/adb/0004-Define-clang-only-nullability-specifiers-when-__clan.patch b/patches/adb/0004-Define-clang-only-nullability-specifiers-when-__clan.patch index 427d01b..6694406 100644 --- a/patches/adb/0004-Define-clang-only-nullability-specifiers-when-__clan.patch +++ b/patches/adb/0004-Define-clang-only-nullability-specifiers-when-__clan.patch @@ -30,9 +30,9 @@ diff --git a/sysdeps.h b/sysdeps.h index 5ba85b4d..2115a32b 100644 --- a/sysdeps.h +++ b/sysdeps.h -@@ -49,6 +49,12 @@ static inline void* mempcpy(void* dst, const void* src, size_t n) { - } - #endif +@@ -55,6 +55,12 @@ static inline void* mempcpy(void* dst, const void* src, size_t n) { + + std::optional network_peek(borrowed_fd fd); +// Clang-only nullability specifiers +#ifndef __clang__ diff --git a/patches/adb/0007-adb-Fix-unknown-__xx_write-member-in-std-ostream.patch b/patches/adb/0007-adb-Fix-unknown-__xx_write-member-in-std-ostream.patch new file mode 100644 index 0000000..455f613 --- /dev/null +++ b/patches/adb/0007-adb-Fix-unknown-__xx_write-member-in-std-ostream.patch @@ -0,0 +1,29 @@ +From bfd129ad4c023ffec8a16c1dbd8f1efebd68ff7b Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath +Date: Sat, 10 Aug 2024 20:24:00 +0000 +Subject: [PATCH] adb: Fix unknown __xx_write member in std::ostream + +This fixes the following compiler error. + +sysdeps.h:559:17: error: 'std::ostream` {aka 'class std::basic_ostream`} has no member named '___xxx_write` + 559 | #define write ___xxx_write + | ^~~~~~~~~~~~ +--- + sysdeps.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/sysdeps.h b/sysdeps.h +index e87501c..af548c5 100644 +--- a/sysdeps.h ++++ b/sysdeps.h +@@ -555,8 +555,10 @@ static inline int adb_pwrite(int fd, const void* buf, size_t len, off64_t offset + #endif + } + ++#ifdef write + #undef write + #define write ___xxx_write ++#endif + #undef pwrite + #define pwrite ___xxx_pwrite + diff --git a/patches/adb/0008-adb-Disable-bonjour-check.patch b/patches/adb/0008-adb-Disable-bonjour-check.patch new file mode 100644 index 0000000..059592f --- /dev/null +++ b/patches/adb/0008-adb-Disable-bonjour-check.patch @@ -0,0 +1,25 @@ +From bedc0c38148add6841832f0815fb589c78cc16f7 Mon Sep 17 00:00:00 2001 +From: Biswapriyo Nath +Date: Sun, 11 Aug 2024 04:47:21 +0000 +Subject: [PATCH] adb: Disable bonjour check + +--- + adb.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/adb.cpp b/adb.cpp +index 225ddaf..1be30eb 100644 +--- a/adb.cpp ++++ b/adb.cpp +@@ -1319,7 +1319,7 @@ HostRequestResult handle_host_request(std::string_view service, TransportType ty + } + status.set_usb_backend_forced(getenv("ADB_LIBUSB") != nullptr); + +- if (using_bonjour()) { ++ if (false) { + status.set_mdns_backend(adb::proto::AdbServerStatus::BONJOUR); + } else { + status.set_mdns_backend(adb::proto::AdbServerStatus::OPENSCREEN); +-- +2.46.0 + diff --git a/patches/adb/0013-adb-disable-fastdeploy-support.patch b/patches/adb/0013-adb-disable-fastdeploy-support.patch index 8ca393f..7c1ad53 100644 --- a/patches/adb/0013-adb-disable-fastdeploy-support.patch +++ b/patches/adb/0013-adb-disable-fastdeploy-support.patch @@ -44,7 +44,7 @@ index 97debae1..35278e2f 100644 auto metadata = extract_metadata(apk_file[0]); if (metadata.has_value()) { auto patchFd = apply_patch_on_device(apk_dest.c_str()); -@@ -290,6 +295,9 @@ static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy) +@@ -285,6 +285,9 @@ static int install_app_legacy(int argc, const char** argv, bool use_fastdeploy) return status; } @@ -53,8 +53,8 @@ index 97debae1..35278e2f 100644 +#endif } - if (do_sync_push(apk_file, apk_dest.c_str(), false, CompressionType::Any, false)) { -@@ -499,6 +507,7 @@ int install_app(int argc, const char** argv) { + if (do_sync_push(apk_file, apk_dest.c_str(), false, CompressionType::Any, false, false)) { +@@ -494,6 +497,7 @@ int install_app(int argc, const char** argv) { error_exit("Attempting to use streaming install on unsupported device"); } 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 44ce02b..169e435 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 @@ -361,11 +361,12 @@ diff --git a/libcutils/include/private/fs_config.h b/libcutils/include/private/f index 45f46e5..b4ceade 100644 --- a/libcutils/include/private/fs_config.h +++ b/libcutils/include/private/fs_config.h -@@ -22,13 +22,14 @@ - #pragma once - +@@ -24,14 +24,15 @@ + #include + #include #include -#include + #include #include @@ -376,11 +377,11 @@ index 45f46e5..b4ceade 100644 +extern "C" { +#endif - /* - * Used in: -@@ -43,4 +44,6 @@ __BEGIN_DECLS + /* This API is deprecated. New users should call get_fs_config. */ void fs_config(const char* path, int dir, const char* target_out_path, unsigned* uid, unsigned* gid, - unsigned* mode, uint64_t* capabilities); +@@ -56,4 +57,6 @@ struct fs_config { + bool get_fs_config(const char* path, bool dir, const char* target_out_path, + struct fs_config* conf); -__END_DECLS +#ifdef __cplusplus @@ -463,18 +464,6 @@ index e89cb54..86b6604 100644 +#ifdef __cplusplus +} +#endif -diff --git a/libprocessgroup/cgroup_map.h b/libprocessgroup/cgroup_map.h -index 5cdf8b2..322d4c4 100644 ---- a/libprocessgroup/cgroup_map.h -+++ b/libprocessgroup/cgroup_map.h -@@ -16,7 +16,6 @@ - - #pragma once - --#include - #include - - #include diff --git a/libprocessgroup/cgrouprc/include/android/cgrouprc.h b/libprocessgroup/cgrouprc/include/android/cgrouprc.h index e704a36..e65aa4a 100644 --- a/libprocessgroup/cgrouprc/include/android/cgrouprc.h @@ -554,18 +543,6 @@ index dbaeb93..0cc119c 100644 +#ifdef __cplusplus +} +#endif -diff --git a/libprocessgroup/task_profiles.h b/libprocessgroup/task_profiles.h -index 4663f64..bbba033 100644 ---- a/libprocessgroup/task_profiles.h -+++ b/libprocessgroup/task_profiles.h -@@ -16,7 +16,6 @@ - - #pragma once - --#include - #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 @@ -790,6 +767,31 @@ index c77d9ff..00bd562 100644 } +diff --git a/libvendorsupport/include/vendorsupport/api_level.h b/libvendorsupport/include/vendorsupport/api_level.h +index 3427bc6..080389d 100644 +--- a/libvendorsupport/include/vendorsupport/api_level.h ++++ b/libvendorsupport/include/vendorsupport/api_level.h +@@ -14,9 +14,10 @@ + + #pragma once + +-#include + +-__BEGIN_DECLS ++#ifdef __cplusplus ++extern "C" { ++#endif + + #define __ANDROID_VENDOR_API_MAX__ 1000000 + #define __INVALID_API_LEVEL -1 +@@ -62,4 +63,6 @@ int AVendorSupport_getSdkApiLevelOf(int vendorApiLevel); + int AVendorSupport_getVendorApiLevel(); + #endif // __ANDROID_VENDOR__ + +-__END_DECLS ++#ifdef __cplusplus ++} ++#endif diff --git a/llkd/include/llkd.h b/llkd/include/llkd.h index 0822a3e..a4e3037 100644 --- a/llkd/include/llkd.h diff --git a/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch b/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch index 783694d..db60427 100644 --- a/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch +++ b/patches/extras/0002-libjsonpbparse-Fix-build-after-protobuf-util-Status-.patch @@ -19,9 +19,9 @@ index 3a042e7..62d651d 100644 +#if GOOGLE_PROTOBUF_VERSION < 3016000 + return MakeError(status.error_message().as_string()); +#elif GOOGLE_PROTOBUF_VERSION < 4022000 - return MakeError(status.message().as_string()); ++ return MakeError(status.message().as_string()); +#else -+ return MakeError(std::string(status.message())); + return MakeError(std::string(status.message())); +#endif } return ErrorOr(std::move(json)); @@ -33,9 +33,9 @@ index 3a042e7..62d651d 100644 +#if GOOGLE_PROTOBUF_VERSION < 3016000 + return MakeError(status.error_message().as_string()); +#elif GOOGLE_PROTOBUF_VERSION < 4022000 - return MakeError(status.message().as_string()); ++ return MakeError(status.message().as_string()); +#else -+ return MakeError(std::string(status.message())); + return MakeError(std::string(status.message())); +#endif } if (!message->ParseFromString(binary)) { diff --git a/vendor/CMakeLists.adb.txt b/vendor/CMakeLists.adb.txt index 2c63b38..f43bd92 100644 --- a/vendor/CMakeLists.adb.txt +++ b/vendor/CMakeLists.adb.txt @@ -1,7 +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_HOST_PROTO_SRCS ADB_HOST_PROTO_HDRS + adb/proto/adb_host.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 @@ -35,7 +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_HOST_PROTO_SRCS} ${ADB_HOST_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.libbase.txt b/vendor/CMakeLists.libbase.txt index 91bd849..97404ea 100644 --- a/vendor/CMakeLists.libbase.txt +++ b/vendor/CMakeLists.libbase.txt @@ -11,6 +11,7 @@ add_library(libbase STATIC libbase/posix_strerror_r.cpp libbase/process.cpp libbase/properties.cpp + libbase/result.cpp libbase/stringprintf.cpp libbase/strings.cpp libbase/threads.cpp diff --git a/vendor/adb b/vendor/adb index 3f0d728..ce9ea51 160000 --- a/vendor/adb +++ b/vendor/adb @@ -1 +1 @@ -Subproject commit 3f0d728c0c39f24ca8afa2e65e642832119e2ba3 +Subproject commit ce9ea51f30f69f7560db692f7cb4d5d5502c3653 diff --git a/vendor/avb b/vendor/avb index 20e8b4c..6eedb12 160000 --- a/vendor/avb +++ b/vendor/avb @@ -1 +1 @@ -Subproject commit 20e8b4ca2a5c01ff054e896a49e2be2233a5303f +Subproject commit 6eedb12491da292911a1b88911a6682fd2e827bd diff --git a/vendor/boringssl b/vendor/boringssl index 538b2a6..9cffd74 160000 --- a/vendor/boringssl +++ b/vendor/boringssl @@ -1 +1 @@ -Subproject commit 538b2a6cf0497cf8bb61ae726a484a3d7a34e54e +Subproject commit 9cffd74fdb65c69506a0ce1b19420a67ad0cb19e diff --git a/vendor/core b/vendor/core index db5a18a..90e4908 160000 --- a/vendor/core +++ b/vendor/core @@ -1 +1 @@ -Subproject commit db5a18a5fac8ac58177e87fc5e7e0033aa514aef +Subproject commit 90e4908e776d2be9b26b87af649e63e4208cf085 diff --git a/vendor/e2fsprogs b/vendor/e2fsprogs index 028d97f..81357db 160000 --- a/vendor/e2fsprogs +++ b/vendor/e2fsprogs @@ -1 +1 @@ -Subproject commit 028d97f1d1c2ea9816b279512326aca949fafe0a +Subproject commit 81357db29373b2bab58af88dc4b747662047b7e7 diff --git a/vendor/extras b/vendor/extras index f5a14a1..d8e488a 160000 --- a/vendor/extras +++ b/vendor/extras @@ -1 +1 @@ -Subproject commit f5a14a11a6146cb9c3e2801737c23681478b607d +Subproject commit d8e488a499f5a96f788eac9d5364f0b839306c57 diff --git a/vendor/f2fs-tools b/vendor/f2fs-tools index e20d15e..f49d427 160000 --- a/vendor/f2fs-tools +++ b/vendor/f2fs-tools @@ -1 +1 @@ -Subproject commit e20d15ee237ca4901b179a477f254b5d4501a410 +Subproject commit f49d4274ddd9de595129741fbf0a62c5901c0223 diff --git a/vendor/fmtlib b/vendor/fmtlib index d419391..c230d4f 160000 --- a/vendor/fmtlib +++ b/vendor/fmtlib @@ -1 +1 @@ -Subproject commit d419391dc911f385a0b0a46853223c364906b838 +Subproject commit c230d4f0a5a7058a6f0468cd384200ba2ed2d8c6 diff --git a/vendor/libbase b/vendor/libbase index b243579..328768f 160000 --- a/vendor/libbase +++ b/vendor/libbase @@ -1 +1 @@ -Subproject commit b243579572671d62f3f24e38cf8d59c275358e9e +Subproject commit 328768fabb054387ad7f64c984d4afcea70d25c9 diff --git a/vendor/libufdt b/vendor/libufdt index 47c5588..4ff186e 160000 --- a/vendor/libufdt +++ b/vendor/libufdt @@ -1 +1 @@ -Subproject commit 47c5588db2a24e73ffd367a7626aceef05f1a6a9 +Subproject commit 4ff186e421e0e788fad30c30753ed196f435c8b4 diff --git a/vendor/libusb b/vendor/libusb index c960485..ab84e07 160000 --- a/vendor/libusb +++ b/vendor/libusb @@ -1 +1 @@ -Subproject commit c9604857c0a5928ac8c47f6dc67e4f4fb699d675 +Subproject commit ab84e07b9a3575bc6eddb87dba87f85f0ab8490f diff --git a/vendor/libziparchive b/vendor/libziparchive index 94c11c9..b1d0c47 160000 --- a/vendor/libziparchive +++ b/vendor/libziparchive @@ -1 +1 @@ -Subproject commit 94c11c9d13fa3477f034c1af8621ca446e6f1550 +Subproject commit b1d0c47e59e1a59b79f38ed0cbb94191cbf37416 diff --git a/vendor/logging b/vendor/logging index 90fafcf..153a153 160000 --- a/vendor/logging +++ b/vendor/logging @@ -1 +1 @@ -Subproject commit 90fafcfd654ea1b9d023b11301ac5d3fdf8ff76c +Subproject commit 153a153f1fccc0cc6b96766d1557518303aebd5e diff --git a/vendor/mkbootimg b/vendor/mkbootimg index 8c48c3c..cbf4ce9 160000 --- a/vendor/mkbootimg +++ b/vendor/mkbootimg @@ -1 +1 @@ -Subproject commit 8c48c3cb81a3f230d7e0a51c21653ffc2da7ce67 +Subproject commit cbf4ce939fb73c0b74127c4cb5e1092b127a4f4f diff --git a/vendor/selinux b/vendor/selinux index 2af7683..0496d82 160000 --- a/vendor/selinux +++ b/vendor/selinux @@ -1 +1 @@ -Subproject commit 2af7683b20a7de5264a2d788448b15f56ad6ee6f +Subproject commit 0496d8248e0cb20d6512387f109f41f37f68f6e1