diff --git a/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch index 6f27ed6..a136035 100644 --- a/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch +++ b/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch @@ -1,6 +1,6 @@ -From b6b5d681d6abebd0635802389b382077d575754a Mon Sep 17 00:00:00 2001 +From d263b26ed5a51821b711ac14d94ef586e4ade981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Wed, 21 Aug 2019 19:17:23 +0200 +Date: Tue, 17 Sep 2019 11:42:41 +0200 Subject: [PATCH] Don't use the internal glibc header sys/cdefs.h This patch was created using sed(1) and ag(1) with the following script: @@ -41,7 +41,7 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- .../include/memunreachable/memunreachable.h | 9 +++++--- .../include/nativeloader/dlext_namespaces.h | 8 +++++-- libnetutils/include/netutils/ifc.h | 9 +++++--- - .../packagelistparser/packagelistparser.h | 9 +++++--- + .../packagelistparser/packagelistparser.h | 8 +++++-- .../cgrouprc/include/android/cgrouprc.h | 8 +++++-- .../include/processgroup/processgroup.h | 9 +++++--- libsuspend/autosuspend_ops.h | 8 +++++-- @@ -62,7 +62,7 @@ https://wiki.musl-libc.org/faq.html#Q:-When-compiling-something-against-musl,-I- trusty/gatekeeper/trusty_gatekeeper_ipc.h | 8 +++++-- .../ipc/trusty_keymaster_ipc.h | 8 +++++-- .../storage/lib/include/trusty/lib/storage.h | 8 +++++-- - 48 files changed, 285 insertions(+), 140 deletions(-) + 48 files changed, 285 insertions(+), 139 deletions(-) diff --git a/debuggerd/include/debuggerd/handler.h b/debuggerd/include/debuggerd/handler.h index 7196e0ad4..9ba20db19 100644 @@ -618,10 +618,10 @@ index 7c53cbb65..df881ec51 100644 +} +#endif diff --git a/liblog/logger.h b/liblog/logger.h -index 1f632c037..24cbcfd2e 100644 +index accb6e7cb..2bfd0692e 100644 --- a/liblog/logger.h +++ b/liblog/logger.h -@@ -25,7 +25,9 @@ +@@ -24,7 +24,9 @@ #include "log_portability.h" #include "uio.h" @@ -632,7 +632,7 @@ index 1f632c037..24cbcfd2e 100644 /* Union, sock or fd of zero is not allowed unless static initialized */ union android_log_context_union { -@@ -162,4 +164,6 @@ void __android_log_unlock(); +@@ -161,4 +163,6 @@ void __android_log_unlock(); extern int __android_log_transport; @@ -786,14 +786,11 @@ index 3b272343d..60c68d76c 100644 #endif /* _NETUTILS_IFC_H_ */ diff --git a/libpackagelistparser/include/packagelistparser/packagelistparser.h b/libpackagelistparser/include/packagelistparser/packagelistparser.h -index 3cb6b9af0..9e641ad2b 100644 +index e89cb5400..86b6604ca 100644 --- a/libpackagelistparser/include/packagelistparser/packagelistparser.h +++ b/libpackagelistparser/include/packagelistparser/packagelistparser.h -@@ -29,10 +29,11 @@ - #define PACKAGELISTPARSER_H_ - +@@ -19,7 +19,9 @@ #include --#include #include -__BEGIN_DECLS @@ -801,18 +798,16 @@ index 3cb6b9af0..9e641ad2b 100644 +extern "C" { +#endif - /** The file containing the list of installed packages on the system */ - #define PACKAGES_LIST_FILE "/data/system/packages.list" -@@ -89,6 +90,8 @@ extern bool packagelist_parse(pfn_on_package callback, void *userdata); - */ - extern void packagelist_free(pkg_info *info); + typedef struct gid_list { + /** Number of gids. */ +@@ -78,4 +80,6 @@ bool packagelist_parse_file(const char* path, bool (*callback)(pkg_info* info, v + /** Frees the given `pkg_info`. */ + void packagelist_free(pkg_info* info); -__END_DECLS +#ifdef __cplusplus +} +#endif - - #endif /* PACKAGELISTPARSER_H_ */ diff --git a/libprocessgroup/cgrouprc/include/android/cgrouprc.h b/libprocessgroup/cgrouprc/include/android/cgrouprc.h index 0f6a9cd5d..3a41a550d 100644 --- a/libprocessgroup/cgrouprc/include/android/cgrouprc.h diff --git a/patches/core/0002-adb-disable-mdns-transport-support.patch b/patches/core/0002-adb-disable-mdns-transport-support.patch index fca8c42..51e5f2f 100644 --- a/patches/core/0002-adb-disable-mdns-transport-support.patch +++ b/patches/core/0002-adb-disable-mdns-transport-support.patch @@ -1,4 +1,4 @@ -From 9e84fd21dbd5387f5eea9afd0dbbbeb4d27c8aaf Mon Sep 17 00:00:00 2001 +From 586a4d9e878ba3294b604cfce8572bf6ee4336c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sun, 1 Sep 2019 15:04:18 +0000 Subject: [PATCH] adb: disable mdns transport support diff --git a/patches/core/0003-fdevent-missing-atomic-include.patch b/patches/core/0003-fdevent-missing-atomic-include.patch index aa60519..f0b5e81 100644 --- a/patches/core/0003-fdevent-missing-atomic-include.patch +++ b/patches/core/0003-fdevent-missing-atomic-include.patch @@ -1,4 +1,4 @@ -From a94177f5cbc73f8806fcddc7640af491d4da3050 Mon Sep 17 00:00:00 2001 +From 1d151b53bb4671e753bb8358f56dec8f758aadec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sun, 1 Sep 2019 15:05:17 +0000 Subject: [PATCH] fdevent: missing atomic include @@ -8,10 +8,10 @@ Subject: [PATCH] fdevent: missing atomic include 1 file changed, 1 insertion(+) diff --git a/adb/fdevent/fdevent.h b/adb/fdevent/fdevent.h -index ccb0c9221..e7a84f49b 100644 +index 2424252f5..776904643 100644 --- a/adb/fdevent/fdevent.h +++ b/adb/fdevent/fdevent.h -@@ -26,6 +26,7 @@ +@@ -27,6 +27,7 @@ #include #include #include diff --git a/patches/core/0004-Fix-inclusion-of-stdatomic.h-with-g.patch b/patches/core/0004-Fix-inclusion-of-stdatomic.h-with-g.patch index 2dde0b4..1616f1b 100644 --- a/patches/core/0004-Fix-inclusion-of-stdatomic.h-with-g.patch +++ b/patches/core/0004-Fix-inclusion-of-stdatomic.h-with-g.patch @@ -1,4 +1,4 @@ -From 7d39438932de32c95c5a90f1ffeac31bfd8a21a7 Mon Sep 17 00:00:00 2001 +From eafcbdb9fddbd5e9fbebf693c38db641f038c720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 27 Feb 2018 16:30:30 +0100 Subject: [PATCH] Fix inclusion of stdatomic.h with g++ @@ -6,9 +6,9 @@ Subject: [PATCH] Fix inclusion of stdatomic.h with g++ See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60932#c5 --- libcutils/include/cutils/trace.h | 5 +++++ - liblog/logger.h | 6 ++++++ + liblog/logger.h | 5 +++++ liblog/logger_write.cpp | 5 +++++ - 3 files changed, 16 insertions(+) + 3 files changed, 15 insertions(+) diff --git a/libcutils/include/cutils/trace.h b/libcutils/include/cutils/trace.h index 712f75c4f..9a41f4be7 100644 @@ -28,10 +28,10 @@ index 712f75c4f..9a41f4be7 100644 #include #include diff --git a/liblog/logger.h b/liblog/logger.h -index 24cbcfd2e..046710332 100644 +index 2bfd0692e..5adb6ac0d 100644 --- a/liblog/logger.h +++ b/liblog/logger.h -@@ -16,7 +16,13 @@ +@@ -16,7 +16,12 @@ #pragma once @@ -41,10 +41,9 @@ index 24cbcfd2e..046710332 100644 +#else #include +#endif -+ - #include #include + #include diff --git a/liblog/logger_write.cpp b/liblog/logger_write.cpp index a4b3cd7b2..0f44b859c 100644 --- a/liblog/logger_write.cpp diff --git a/patches/core/0005-group_member-is-a-nonstandard-GNU-extension.patch b/patches/core/0005-group_member-is-a-nonstandard-GNU-extension.patch index 988b986..31b1828 100644 --- a/patches/core/0005-group_member-is-a-nonstandard-GNU-extension.patch +++ b/patches/core/0005-group_member-is-a-nonstandard-GNU-extension.patch @@ -1,4 +1,4 @@ -From 3252e667ddbfa93d1412b66d772333b7193c3aaa Mon Sep 17 00:00:00 2001 +From 170a53cee5f6ab2adb9306862db3d1f6e8da0726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 27 Feb 2018 17:24:05 +0100 Subject: [PATCH] group_member is a nonstandard GNU extension diff --git a/patches/core/0006-getprogname-3-is-usually-only-defined-on-BSDs.patch b/patches/core/0006-getprogname-3-is-usually-only-defined-on-BSDs.patch index 3287dcf..8e108e2 100644 --- a/patches/core/0006-getprogname-3-is-usually-only-defined-on-BSDs.patch +++ b/patches/core/0006-getprogname-3-is-usually-only-defined-on-BSDs.patch @@ -1,4 +1,4 @@ -From a04b665ed514ed8d1d0a493caaf2fb3e91d4d47c Mon Sep 17 00:00:00 2001 +From 36d839297a23aadebd20d9048af835ded5d10150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 27 Feb 2018 17:27:39 +0100 Subject: [PATCH] getprogname(3) is usually only defined on BSDs diff --git a/patches/core/0007-fix-initializer-element-is-not-constant-error-when-b.patch b/patches/core/0007-fix-initializer-element-is-not-constant-error-when-b.patch index a6723f2..acaf3a6 100644 --- a/patches/core/0007-fix-initializer-element-is-not-constant-error-when-b.patch +++ b/patches/core/0007-fix-initializer-element-is-not-constant-error-when-b.patch @@ -1,4 +1,4 @@ -From df248f89ceca999a6d836f6409c7f1a48f71fe8b Mon Sep 17 00:00:00 2001 +From 6ec25af4890f6083522c5a2ea7b83319315ca639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 27 Feb 2018 17:37:12 +0100 Subject: [PATCH] fix "initializer element is not constant"-error when building @@ -9,10 +9,10 @@ Subject: [PATCH] fix "initializer element is not constant"-error when building 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/liblog/logprint.cpp b/liblog/logprint.cpp -index 6b5ea4c23..d33c7d0f3 100644 +index 3a544458b..f829a6a9f 100644 --- a/liblog/logprint.cpp +++ b/liblog/logprint.cpp -@@ -910,9 +910,9 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData, size_t +@@ -909,9 +909,9 @@ static int android_log_printBinaryEvent(const unsigned char** pEventData, size_t } break; case TYPE_MONOTONIC: { diff --git a/patches/core/0008-Define-clang-only-nullability-specifiers-when-__clan.patch b/patches/core/0008-Define-clang-only-nullability-specifiers-when-__clan.patch index 3512f36..c84d57b 100644 --- a/patches/core/0008-Define-clang-only-nullability-specifiers-when-__clan.patch +++ b/patches/core/0008-Define-clang-only-nullability-specifiers-when-__clan.patch @@ -1,4 +1,4 @@ -From dbaf896f4f6aea7d905138466aaddc5ff79c5f54 Mon Sep 17 00:00:00 2001 +From 14353eecedb649d2233ad6df112f33a60b7df170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 27 Feb 2018 17:48:49 +0100 Subject: [PATCH] Define clang-only nullability specifiers when __clang__ is diff --git a/patches/core/0009-Include-libusb-1.0-libusb.h-instead-of-libusb-libusb.patch b/patches/core/0009-Include-libusb-1.0-libusb.h-instead-of-libusb-libusb.patch index 83b9ae3..e9018ee 100644 --- a/patches/core/0009-Include-libusb-1.0-libusb.h-instead-of-libusb-libusb.patch +++ b/patches/core/0009-Include-libusb-1.0-libusb.h-instead-of-libusb-libusb.patch @@ -1,4 +1,4 @@ -From a97e2e0e568bc678afba2abeeee23bfcb7a56c37 Mon Sep 17 00:00:00 2001 +From a49cab2c60b71aac1acb0ad98e9599eb1df77466 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Fri, 25 Aug 2017 23:30:34 +0000 Subject: [PATCH] Include libusb-1.0/libusb.h instead of libusb/libusb.h diff --git a/patches/core/0010-socket.h-include-sys-select.h-for-fd_set-used-in-soc.patch b/patches/core/0010-socket.h-include-sys-select.h-for-fd_set-used-in-soc.patch index 6d17cff..fbad3ca 100644 --- a/patches/core/0010-socket.h-include-sys-select.h-for-fd_set-used-in-soc.patch +++ b/patches/core/0010-socket.h-include-sys-select.h-for-fd_set-used-in-soc.patch @@ -1,4 +1,4 @@ -From 3d7bdd11ac7839b650dce086f4b3374fc4aaffb4 Mon Sep 17 00:00:00 2001 +From 9f0ead465298fa4da5628493b159147149c16fa2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 28 Feb 2018 20:22:09 +0100 Subject: [PATCH] socket.h: include sys/select.h for fd_set used in socket.cpp diff --git a/patches/core/0011-Include-string.h-in-various-file-missing-it.patch b/patches/core/0011-Include-string.h-in-various-file-missing-it.patch index bff8727..1199221 100644 --- a/patches/core/0011-Include-string.h-in-various-file-missing-it.patch +++ b/patches/core/0011-Include-string.h-in-various-file-missing-it.patch @@ -1,4 +1,4 @@ -From d4dc162302db5da549ddc5d0ee01b8e2cf848272 Mon Sep 17 00:00:00 2001 +From c85143654f46db5f814ba08568ef8b5f0cda20f1 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Fri, 25 Aug 2017 23:30:34 +0000 Subject: [PATCH] Include string.h in various file missing it @@ -6,10 +6,9 @@ Subject: [PATCH] Include string.h in various file missing it Most of these need string.h for strerror(3). --- adb/sysdeps/posix/network.cpp | 1 + - base/errors_unix.cpp | 1 + base/file.cpp | 1 + base/logging.cpp | 1 + - 4 files changed, 4 insertions(+) + 3 files changed, 3 insertions(+) diff --git a/adb/sysdeps/posix/network.cpp b/adb/sysdeps/posix/network.cpp index c5c227568..99686f15f 100644 @@ -23,18 +22,6 @@ index c5c227568..99686f15f 100644 #include #include -diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp -index 296995efe..48269b675 100644 ---- a/base/errors_unix.cpp -+++ b/base/errors_unix.cpp -@@ -17,6 +17,7 @@ - #include "android-base/errors.h" - - #include -+#include - - namespace android { - namespace base { diff --git a/base/file.cpp b/base/file.cpp index 3dfcfbb7e..1b5c0203f 100644 --- a/base/file.cpp diff --git a/patches/core/0012-fastboot-make-mke2fs_path-configurable.patch b/patches/core/0012-fastboot-make-mke2fs_path-configurable.patch index 1ca6ddf..53aaafe 100644 --- a/patches/core/0012-fastboot-make-mke2fs_path-configurable.patch +++ b/patches/core/0012-fastboot-make-mke2fs_path-configurable.patch @@ -1,4 +1,4 @@ -From 7790312626a476622ace72896117d13359ff9240 Mon Sep 17 00:00:00 2001 +From 011ccdcbab527a387a1a3b79149b1a61755e16a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Mon, 18 Jun 2018 23:25:14 +0200 Subject: [PATCH] fastboot: make mke2fs_path configurable diff --git a/patches/core/0013-adb.cpp-fix-warning-regarding-execl-3-invocation.patch b/patches/core/0013-adb.cpp-fix-warning-regarding-execl-3-invocation.patch index c74ab11..e83cd95 100644 --- a/patches/core/0013-adb.cpp-fix-warning-regarding-execl-3-invocation.patch +++ b/patches/core/0013-adb.cpp-fix-warning-regarding-execl-3-invocation.patch @@ -1,4 +1,4 @@ -From cc70096e75ea5558330dc2a1acf83661046948dd Mon Sep 17 00:00:00 2001 +From a90d509b2d89cd9f7ff109c219d3f9857878e7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 19 Jun 2018 09:44:06 +0200 Subject: [PATCH] adb.cpp: fix warning regarding execl(3) invocation @@ -12,7 +12,7 @@ warning: missing sentinel in function call [-Wformat=] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adb/adb.cpp b/adb/adb.cpp -index 24d4292d0..687d9f096 100644 +index 7dff1b8d2..0d27e83aa 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -876,7 +876,7 @@ int launch_server(const std::string& socket_spec) { diff --git a/patches/core/0014-usb_linux.cpp-include-sys-sysmacros.h-for-minor-majo.patch b/patches/core/0014-usb_linux.cpp-include-sys-sysmacros.h-for-minor-majo.patch index b6e6f4a..19fe5d9 100644 --- a/patches/core/0014-usb_linux.cpp-include-sys-sysmacros.h-for-minor-majo.patch +++ b/patches/core/0014-usb_linux.cpp-include-sys-sysmacros.h-for-minor-majo.patch @@ -1,4 +1,4 @@ -From a7af5afd435766dcb197f93446d8133511a8809a Mon Sep 17 00:00:00 2001 +From 77b1a2e6dc318bb54d8e1c3e468ed4976e876e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 19 Jun 2018 12:47:09 +0000 Subject: [PATCH] usb_linux.cpp: include sys/sysmacros.h for minor/major @@ -8,7 +8,7 @@ Subject: [PATCH] usb_linux.cpp: include sys/sysmacros.h for minor/major 1 file changed, 1 insertion(+) diff --git a/adb/client/usb_linux.cpp b/adb/client/usb_linux.cpp -index 81b830643..97a2bbc7a 100644 +index 17b4db159..7d2dd5f83 100644 --- a/adb/client/usb_linux.cpp +++ b/adb/client/usb_linux.cpp @@ -32,6 +32,7 @@ diff --git a/patches/core/0015-adb-Reduce-fallback-size-for-_SC_GETPW_R_SIZE_MAX.patch b/patches/core/0015-adb-Reduce-fallback-size-for-_SC_GETPW_R_SIZE_MAX.patch index ece0661..63a7b17 100644 --- a/patches/core/0015-adb-Reduce-fallback-size-for-_SC_GETPW_R_SIZE_MAX.patch +++ b/patches/core/0015-adb-Reduce-fallback-size-for-_SC_GETPW_R_SIZE_MAX.patch @@ -1,4 +1,4 @@ -From 435700088eaed2b8cbbc75a7d59c52cc50430aab Mon Sep 17 00:00:00 2001 +From 707f5a76e51c698028c44145b5cea1991cf6f098 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 24 Oct 2018 09:48:40 -0400 Subject: [PATCH] adb: Reduce fallback size for _SC_GETPW_R_SIZE_MAX @@ -9,7 +9,7 @@ See: https://github.com/nmeum/android-tools/pull/5#discussion_r227946282 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adb/adb_utils.cpp b/adb/adb_utils.cpp -index cf5fbc88d..d1392f06d 100644 +index d1910f1c3..593448a0a 100644 --- a/adb/adb_utils.cpp +++ b/adb/adb_utils.cpp @@ -294,7 +294,7 @@ std::string adb_get_homedir_path() { diff --git a/patches/core/0016-libcutils-include-sys-select.h-for-timeval.patch b/patches/core/0016-libcutils-include-sys-select.h-for-timeval.patch index b6426a4..efa45a6 100644 --- a/patches/core/0016-libcutils-include-sys-select.h-for-timeval.patch +++ b/patches/core/0016-libcutils-include-sys-select.h-for-timeval.patch @@ -1,4 +1,4 @@ -From 697ea0147bd28082cc834b37efb15b4da4540447 Mon Sep 17 00:00:00 2001 +From 155d0c0698367312c8c8cd4e504bc4d217dd084d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 21 Aug 2019 19:59:43 +0200 Subject: [PATCH] libcutils: include sys/select.h for timeval diff --git a/patches/core/0017-liblog-Fix-initialization-of-android_log_transport_w.patch b/patches/core/0017-liblog-Fix-initialization-of-android_log_transport_w.patch index ccbd2fb..a542a64 100644 --- a/patches/core/0017-liblog-Fix-initialization-of-android_log_transport_w.patch +++ b/patches/core/0017-liblog-Fix-initialization-of-android_log_transport_w.patch @@ -1,4 +1,4 @@ -From 2d94bd3f415975f294b046ab43ea438f1dd924ce Mon Sep 17 00:00:00 2001 +From 1834e64f1bb3315cbdf7b0668213919da59a9d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 21 Aug 2019 20:01:26 +0200 Subject: [PATCH] liblog: Fix initialization of android_log_transport_write @@ -23,10 +23,10 @@ index c0b0e69a5..29bcd4f75 100644 .open = fakeOpen, .close = fakeClose, diff --git a/liblog/stderr_write.cpp b/liblog/stderr_write.cpp -index e324a7c65..a32626099 100644 +index e76673f74..1deb88b37 100644 --- a/liblog/stderr_write.cpp +++ b/liblog/stderr_write.cpp -@@ -56,8 +56,8 @@ struct stderrContext { +@@ -55,8 +55,8 @@ struct stderrContext { struct android_log_transport_write stderrLoggerWrite = { .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node}, diff --git a/patches/core/0018-logging.h-only-activate-ostream-warnings-when-clang-.patch b/patches/core/0018-logging.h-only-activate-ostream-warnings-when-clang-.patch index 1e1cbcf..03a0131 100644 --- a/patches/core/0018-logging.h-only-activate-ostream-warnings-when-clang-.patch +++ b/patches/core/0018-logging.h-only-activate-ostream-warnings-when-clang-.patch @@ -1,4 +1,4 @@ -From 23889a11c2e0cdda76e04925d8364d1ccb99180d Mon Sep 17 00:00:00 2001 +From a2fd5ff210ac72c646f830a775e8f408cdc029ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sun, 25 Aug 2019 13:01:38 +0200 Subject: [PATCH] logging.h: only activate ostream warnings when clang is used diff --git a/patches/core/0019-Don-t-include-version.h.patch b/patches/core/0019-Don-t-include-version.h.patch index a2eb0bf..e0aa117 100644 --- a/patches/core/0019-Don-t-include-version.h.patch +++ b/patches/core/0019-Don-t-include-version.h.patch @@ -1,4 +1,4 @@ -From 7b0d908f0a06d0efb49120103bee139528daaf5c Mon Sep 17 00:00:00 2001 +From dec9399d0428444b549354f9fb4d047105f8550f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sun, 1 Sep 2019 13:40:05 +0000 Subject: [PATCH] Don't include version.h @@ -10,7 +10,7 @@ Version is set using a CPPFLAG. 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/adb/adb.cpp b/adb/adb.cpp -index 687d9f096..8841170ba 100644 +index 0d27e83aa..906851493 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -44,8 +44,6 @@ diff --git a/patches/core/0020-Include-cstring-in-various-file-missing-it.patch b/patches/core/0020-Include-cstring-in-various-file-missing-it.patch index 56426d2..4b40698 100644 --- a/patches/core/0020-Include-cstring-in-various-file-missing-it.patch +++ b/patches/core/0020-Include-cstring-in-various-file-missing-it.patch @@ -1,4 +1,4 @@ -From 9f3cc5bd8c2004cef236c22c47c05a3be726f5a8 Mon Sep 17 00:00:00 2001 +From 67d0ebe5041f56c7d4860754f90142b35c6cd6b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Sun, 1 Sep 2019 14:22:06 +0000 Subject: [PATCH] Include cstring in various file missing it @@ -10,10 +10,10 @@ Subject: [PATCH] Include cstring in various file missing it 3 files changed, 3 insertions(+) diff --git a/adb/types.h b/adb/types.h -index cd1366dfb..1eb7e4b6d 100644 +index 8bd66be57..9523547eb 100644 --- a/adb/types.h +++ b/adb/types.h -@@ -22,6 +22,7 @@ +@@ -24,6 +24,7 @@ #include #include #include @@ -22,23 +22,23 @@ index cd1366dfb..1eb7e4b6d 100644 #include diff --git a/fs_mgr/liblp/reader.cpp b/fs_mgr/liblp/reader.cpp -index dcee6d2d8..6fcd613ab 100644 +index 8dbe955fa..959f8e813 100644 --- a/fs_mgr/liblp/reader.cpp +++ b/fs_mgr/liblp/reader.cpp -@@ -19,6 +19,7 @@ - #include +@@ -20,6 +20,7 @@ #include + #include #include +#include #include diff --git a/fs_mgr/liblp/writer.cpp b/fs_mgr/liblp/writer.cpp -index bffcb7e6e..1bf95b56b 100644 +index 8a983adf4..e70903acf 100644 --- a/fs_mgr/liblp/writer.cpp +++ b/fs_mgr/liblp/writer.cpp -@@ -19,6 +19,7 @@ - #include +@@ -20,6 +20,7 @@ + #include #include +#include diff --git a/patches/core/0021-Don-t-use-thread-safety-annotations-with-gcc.patch b/patches/core/0021-Don-t-use-thread-safety-annotations-with-gcc.patch index 2155322..5a3839a 100644 --- a/patches/core/0021-Don-t-use-thread-safety-annotations-with-gcc.patch +++ b/patches/core/0021-Don-t-use-thread-safety-annotations-with-gcc.patch @@ -1,4 +1,4 @@ -From 1b0be10ea58e094cbb953501a9deabff96767437 Mon Sep 17 00:00:00 2001 +From d4415747d45ae90cfa6f733a90305975952ac160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Mon, 16 Sep 2019 19:24:15 +0200 Subject: [PATCH] Don't use thread safety annotations with gcc diff --git a/vendor/core b/vendor/core index 4d954bb..f264eef 160000 --- a/vendor/core +++ b/vendor/core @@ -1 +1 @@ -Subproject commit 4d954bbff078b339cecf476ef73f69858f486913 +Subproject commit f264eef587d3609f1eee3049b327cbc56332114b diff --git a/vendor/extras b/vendor/extras index 720471e..92978a6 160000 --- a/vendor/extras +++ b/vendor/extras @@ -1 +1 @@ -Subproject commit 720471e8dd58d30fca89bb5c22005f2d5f211c75 +Subproject commit 92978a64732641bc75460b2321ac07051ca20ffa diff --git a/vendor/mkbootimg b/vendor/mkbootimg index 983425f..5fd529a 160000 --- a/vendor/mkbootimg +++ b/vendor/mkbootimg @@ -1 +1 @@ -Subproject commit 983425fe948027f60562088f270a80abbfb1018c +Subproject commit 5fd529a189a028142c1e8f70efa7b8a1fe8366e7