svn commit: r527733 - in head/devel: android-tools-adb android-tools-adb/files android-tools-fastboot android-tools-fastboot/files
Jan Beich
jbeich at FreeBSD.org
Tue Mar 3 22:53:37 UTC 2020
Author: jbeich
Date: Tue Mar 3 22:53:35 2020
New Revision: 527733
URL: https://svnweb.freebsd.org/changeset/ports/527733
Log:
devel/android-tools-{adb,fastboot}: update to 29.0.6
Changes: https://android.googlesource.com/platform/system/core/+log/platform-tools-29.0.5..platform-tools-29.0.6/adb
Changes: https://android.googlesource.com/platform/system/core/+log/platform-tools-29.0.5..platform-tools-29.0.6/fastboot
Reported by: portscout
Added:
head/devel/android-tools-adb/files/patch-liblog_logger.h (contents, props changed)
- copied, changed from r527732, head/devel/android-tools-fastboot/files/patch-liblog_logger.h
Deleted:
head/devel/android-tools-fastboot/files/patch-liblog_fake__writer.cpp
head/devel/android-tools-fastboot/files/patch-liblog_logger__write.cpp
Modified:
head/devel/android-tools-adb/Makefile (contents, props changed)
head/devel/android-tools-adb/distinfo (contents, props changed)
head/devel/android-tools-adb/files/Makefile (contents, props changed)
head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h (contents, props changed)
head/devel/android-tools-fastboot/Makefile (contents, props changed)
head/devel/android-tools-fastboot/distinfo (contents, props changed)
head/devel/android-tools-fastboot/files/Makefile (contents, props changed)
head/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h (contents, props changed)
head/devel/android-tools-fastboot/files/patch-liblog_logger.h (contents, props changed)
Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-adb/Makefile Tue Mar 3 22:53:35 2020 (r527733)
@@ -2,7 +2,7 @@
PORTNAME= android-tools-adb
DISTVERSIONPREFIX= platform-tools-
-DISTVERSION?= 29.0.5
+DISTVERSION?= 29.0.6
PORTREVISION?= 0
CATEGORIES= devel comms
Modified: head/devel/android-tools-adb/distinfo
==============================================================================
--- head/devel/android-tools-adb/distinfo Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-adb/distinfo Tue Mar 3 22:53:35 2020 (r527733)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1571358141
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = a89ed6195862578acc01092e8ca390cd7578725bca9eed77b6b730f334b4c255
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = 68752941
+TIMESTAMP = 1581453885
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 3d1898c1ad19f63641090576c60588ab761132b42b306ff4979d30723187d562
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 72302409
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-platform-tools-29.0.5_GH0.tar.gz) = 6975dbe199d76f375a4da5b945be1e389611906420f40b3c5c961a33929d2443
-SIZE (aosp-mirror-platform_development-platform-tools-29.0.5_GH0.tar.gz) = 63881721
+SHA256 (aosp-mirror-platform_development-platform-tools-29.0.6_GH0.tar.gz) = 5560f767082834183e31af0fca9e121996e5e16aac67ce10f9321c4146809a0a
+SIZE (aosp-mirror-platform_development-platform-tools-29.0.6_GH0.tar.gz) = 63959966
Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-adb/files/Makefile Tue Mar 3 22:53:35 2020 (r527733)
@@ -21,6 +21,7 @@ SRCS+= sysdeps_unix.cpp
SRCS+= transport.cpp
SRCS+= transport_local.cpp
SRCS+= transport_usb.cpp
+SRCS+= types.cpp
TEST_SRCS+= adb_io_test.cpp
TEST_SRCS+= adb_listeners_test.cpp
@@ -61,6 +62,7 @@ SRCS+= network.cpp
.PATH: ${.CURDIR}/../base
SRCS+= chrono_utils.cpp
SRCS+= file.cpp
+SRCS+= liblog_symbols.cpp
SRCS+= logging.cpp
SRCS+= parsenetaddress.cpp
SRCS+= stringprintf.cpp
@@ -91,6 +93,11 @@ SRCS+= ../libcutils/sockets.cpp
SRCS+= threads.cpp
# DragonFly, NetBSD, OpenBSD
CPPFLAGS.sockets.cpp+= -o ${.TARGET}
+
+# required by base
+.PATH: ${.CURDIR}/../liblog
+SRCS+= logger_write.cpp
+SRCS+= ../liblog/properties.cpp
CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
CPPFLAGS+= -DADB_HOST=1
Modified: head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h
==============================================================================
--- head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h Tue Mar 3 22:53:35 2020 (r527733)
@@ -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
Copied and modified: head/devel/android-tools-adb/files/patch-liblog_logger.h (from r527732, head/devel/android-tools-fastboot/files/patch-liblog_logger.h)
==============================================================================
--- head/devel/android-tools-fastboot/files/patch-liblog_logger.h Tue Mar 3 21:56:00 2020 (r527732, copy source)
+++ head/devel/android-tools-adb/files/patch-liblog_logger.h Tue Mar 3 22:53:35 2020 (r527733)
@@ -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>
Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-fastboot/Makefile Tue Mar 3 22:53:35 2020 (r527733)
@@ -2,7 +2,7 @@
PORTNAME= android-tools-fastboot
DISTVERSIONPREFIX= platform-tools-
-DISTVERSION?= 29.0.5
+DISTVERSION?= 29.0.6
PORTREVISION?= 0
CATEGORIES= devel sysutils
MASTER_SITES= https://salsa.debian.org/android-tools-team/android-tools/raw/706e754/debian/:manpage
Modified: head/devel/android-tools-fastboot/distinfo
==============================================================================
--- head/devel/android-tools-fastboot/distinfo Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-fastboot/distinfo Tue Mar 3 22:53:35 2020 (r527733)
@@ -1,13 +1,13 @@
-TIMESTAMP = 1571358141
+TIMESTAMP = 1581453885
SHA256 (fastboot.1) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
SIZE (fastboot.1) = 5906
-SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = a89ed6195862578acc01092e8ca390cd7578725bca9eed77b6b730f334b4c255
-SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.5_GH0.tar.gz) = 68752941
-SHA256 (jbeich-platform_external_avb-platform-tools-29.0.5_GH0.tar.gz) = 276c9b656f99dbf80a0fd8e06bdbdcf5d24916902e3b215b18b24cad858be5bc
-SIZE (jbeich-platform_external_avb-platform-tools-29.0.5_GH0.tar.gz) = 797490
-SHA256 (jbeich-platform_system_extras-platform-tools-29.0.5_GH0.tar.gz) = 5183a633aec89474cbe0c53875983e7719436e106a4a7aa1e9097a93bb8a3883
-SIZE (jbeich-platform_system_extras-platform-tools-29.0.5_GH0.tar.gz) = 276210581
-SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.5_GH0.tar.gz) = 772b13294ffcab508ad27461e1bdcb1ce3d95bacf10ed2191f62b2493e1b6aed
-SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.5_GH0.tar.gz) = 12180
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 3d1898c1ad19f63641090576c60588ab761132b42b306ff4979d30723187d562
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.6_GH0.tar.gz) = 72302409
+SHA256 (jbeich-platform_external_avb-platform-tools-29.0.6_GH0.tar.gz) = 3ea64518a9bcbb54bdc755e7558b810b47b506a1f020e600bf8f215315a329e0
+SIZE (jbeich-platform_external_avb-platform-tools-29.0.6_GH0.tar.gz) = 863119
+SHA256 (jbeich-platform_system_extras-platform-tools-29.0.6_GH0.tar.gz) = 528a9d09b342b9037153f9b11ae619c9bbc9908301755bd24687db407257f5aa
+SIZE (jbeich-platform_system_extras-platform-tools-29.0.6_GH0.tar.gz) = 280670895
+SHA256 (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.6_GH0.tar.gz) = e0671a28899351c4ea7b68f6bd8465db88926f5233824fae379bfcf4608c2bda
+SIZE (jbeich-platform_system_tools_mkbootimg-platform-tools-29.0.6_GH0.tar.gz) = 12397
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-fastboot/files/Makefile Tue Mar 3 22:53:35 2020 (r527733)
@@ -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
Modified: head/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h
==============================================================================
--- head/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-fastboot/files/patch-base_include_android-base_logging.h Tue Mar 3 22:53:35 2020 (r527733)
@@ -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
Modified: head/devel/android-tools-fastboot/files/patch-liblog_logger.h
==============================================================================
--- head/devel/android-tools-fastboot/files/patch-liblog_logger.h Tue Mar 3 21:56:00 2020 (r527732)
+++ head/devel/android-tools-fastboot/files/patch-liblog_logger.h Tue Mar 3 22:53:35 2020 (r527733)
@@ -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>
More information about the svn-ports-head
mailing list