diff options
Diffstat (limited to 'devel/android-tools-fastboot/files')
5 files changed, 7 insertions, 51 deletions
diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile index 9aa93b8a07ba..b0f8e4dc95da 100644 --- a/devel/android-tools-fastboot/files/Makefile +++ b/devel/android-tools-fastboot/files/Makefile @@ -23,6 +23,7 @@ SRCS+= usb_libusb.cpp .PATH: ${.CURDIR}/../base SRCS+= errors_unix.cpp SRCS+= file.cpp +SRCS+= liblog_symbols.cpp SRCS+= logging.cpp SRCS+= mapped_file.cpp SRCS+= parsenetaddress.cpp @@ -57,14 +58,10 @@ SRCS+= sockets_unix.cpp # DragonFly, NetBSD, OpenBSD CPPFLAGS.sockets.cpp+= -o ${.TARGET} -# required by base and libutils -.PATH: ${.CURDIR}/../liblog -SRCS+= fake_log_device.cpp -SRCS+= fake_writer.cpp -SRCS+= logger_lock.cpp -SRCS+= logger_name.cpp -SRCS+= logger_write.cpp -SRCS+= logprint.cpp +# required by base and zip_archive +.PATH: ${.CURDIR}/../liblog +SRCS+= logger_write.cpp +SRCS+= ../liblog/properties.cpp # required by fastboot .PATH: ${.CURDIR}/../libsparse @@ -84,8 +81,6 @@ CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dftruncate64=ftruncate CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -Dmmap64=mmap -CPPFLAGS+= -Dpread64=pread -CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../avb diff --git a/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h b/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h index 7e536840b840..7bdccd8bad78 100644 --- a/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h +++ b/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h @@ -9,14 +9,3 @@ static constexpr bool kEnableDChecks = false; #else static constexpr bool kEnableDChecks = true; -@@ -486,8 +486,9 @@ namespace std { // NOLINT(cert-dcl58-cpp) - #pragma clang diagnostic ignored "-Wgcc-compat" - #define OSTREAM_STRING_POINTER_USAGE_WARNING \ - __attribute__((diagnose_if(true, "Unexpected logging of string pointer", "warning"))) -+OSTREAM_STRING_POINTER_USAGE_WARNING // GCC - inline std::ostream& operator<<(std::ostream& stream, const std::string* string_pointer) -- OSTREAM_STRING_POINTER_USAGE_WARNING { -+{ - return stream << static_cast<const void*>(string_pointer); - } - #pragma clang diagnostic pop diff --git a/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp b/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp deleted file mode 100644 index ea76f483c4a8..000000000000 --- a/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- liblog/fake_writer.cpp.orig 2019-10-18 00:22:21 UTC -+++ liblog/fake_writer.cpp -@@ -34,7 +34,7 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1, - struct android_log_transport_write fakeLoggerWrite = { - .name = "fake", - .logMask = 0, -- .context.priv = &logFds, -+ .context = { .priv = &logFds }, // GCC - .available = fakeAvailable, - .open = fakeOpen, - .close = fakeClose, diff --git a/devel/android-tools-fastboot/files/patch-liblog_logger.h b/devel/android-tools-fastboot/files/patch-liblog_logger.h index c446ea70c5c1..2bf6f1fe9fa0 100644 --- a/devel/android-tools-fastboot/files/patch-liblog_logger.h +++ b/devel/android-tools-fastboot/files/patch-liblog_logger.h @@ -1,4 +1,4 @@ ---- liblog/logger.h.orig 2019-08-13 02:10:58 UTC +--- liblog/logger.h.orig 2020-02-11 20:44:45 UTC +++ liblog/logger.h @@ -16,7 +16,13 @@ @@ -11,6 +11,6 @@ +#else #include <stdatomic.h> +#endif + #include <sys/cdefs.h> - #include <cutils/list.h> #include <log/log.h> diff --git a/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp b/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp deleted file mode 100644 index 63dffda415a8..000000000000 --- a/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- liblog/logger_write.cpp.orig 2019-07-17 19:54:09 UTC -+++ liblog/logger_write.cpp -@@ -15,12 +15,12 @@ - */ - - #include <errno.h> --#include <stdatomic.h> - #include <stdlib.h> - #include <string.h> - #include <sys/time.h> - --#ifdef __BIONIC__ -+#if defined(__ANDROID__) -+#include <stdatomic.h> - #include <android/set_abort_message.h> - #endif - |