svn commit: r511280 - in head/devel/android-tools-adb: . files
Jan Beich
jbeich at FreeBSD.org
Fri Sep 6 06:30:07 UTC 2019
Author: jbeich
Date: Fri Sep 6 06:30:02 2019
New Revision: 511280
URL: https://svnweb.freebsd.org/changeset/ports/511280
Log:
devel/android-tools-adb: update to 29.0.2
Changes: https://android.googlesource.com/platform/system/core/+log/android-9.0.0_r3..platform-tools-29.0.2/adb
Added:
head/devel/android-tools-adb/files/patch-adb_adb.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-adb_client_auth.cpp (contents, props changed)
- copied, changed from r511279, head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp
head/devel/android-tools-adb/files/patch-adb_client_commandline.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h (contents, props changed)
head/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-adb_types.h (contents, props changed)
head/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h (contents, props changed)
head/devel/android-tools-adb/files/patch-base_threads.cpp (contents, props changed)
- copied, changed from r511279, head/devel/android-tools-adb/files/patch-base_logging.cpp
head/devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h (contents, props changed)
- copied, changed from r511279, head/devel/android-tools-adb/files/patch-include_cutils_trace.h
head/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-liblog_logger.h (contents, props changed)
head/devel/android-tools-adb/files/patch-liblog_logger__write.cpp (contents, props changed)
- copied, changed from r511279, head/devel/android-tools-adb/files/patch-liblog_logger__write.c
head/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp (contents, props changed)
Deleted:
head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp
head/devel/android-tools-adb/files/patch-adb_adb__io__test.cpp
head/devel/android-tools-adb/files/patch-adb_commandline.cpp
head/devel/android-tools-adb/files/patch-adb_commandline.h
head/devel/android-tools-adb/files/patch-adb_fdevent__test.cpp
head/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp
head/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp
head/devel/android-tools-adb/files/patch-base_logging.cpp
head/devel/android-tools-adb/files/patch-base_parsenetaddress.cpp
head/devel/android-tools-adb/files/patch-base_stringprintf__test.cpp
head/devel/android-tools-adb/files/patch-include_cutils_trace.h
head/devel/android-tools-adb/files/patch-liblog_logger__write.c
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-adb_sysdeps.h (contents, props changed)
head/devel/android-tools-adb/files/patch-base_file.cpp (contents, props changed)
head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h (contents, props changed)
Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/Makefile Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,9 +1,9 @@
# $FreeBSD$
PORTNAME= android-tools-adb
-DISTVERSIONPREFIX= android-
-DISTVERSION?= 9.0.0_r3
-PORTREVISION?= 4
+DISTVERSIONPREFIX= platform-tools-
+DISTVERSION?= 29.0.2
+PORTREVISION?= 0
CATEGORIES= devel comms
MAINTAINER= jbeich at FreeBSD.org
@@ -17,22 +17,18 @@ GH_PROJECT= platform_system_core
CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
-USES= compiler:c++14-lang pkgconfig ssl uidfix
+USES= compiler:c++17-lang pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/adb
INSTALL_WRKSRC= ${BUILD_WRKSRC}
TEST_WRKSRC= ${BUILD_WRKSRC}
-CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
MAKEFILE?= ${.CURDIR}/files/Makefile
MAKE_ENV= BINDIR="${PREFIX}/bin" FILESDIR="${DOCSDIR}" \
- VEREXT="${GH_REVISION}-android"
+ VERSION="${DISTVERSION}${DISTVERSIONSUFFIX}"
ALL_TARGET= all
TEST_TARGET= test
PLIST_FILES= bin/adb
PORTDOCS= *
-# Generated by "make update-revision" for "adb --version"
-GH_REVISION= ${DISTVERSIONSUFFIX:U0fac9018f238:S/-g//}
-
OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON
OPTIONS_DEFAULT=MDNSRESPONDER
OPTIONS_SUB= yes
@@ -69,6 +65,9 @@ post-patch:
${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \
${WRKSRC}/adb/adb_io_test.cpp; \
fi
+# XXX getcwd fails and not connected upstream
+ @${REINPLACE_CMD} -e '/TEST/s/, /&DISABLED_/' \
+ ${WRKSRC}/adb/bugreport_test.cpp
pre-install-TEST-on: do-test
@@ -83,25 +82,4 @@ post-install-BASH-on:
${INSTALL_DATA} ${WRKSRC_bashcomp}/android \
${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES}
-update-revision:
- @${REINPLACE_CMD} -i '' -e "/^VERSION?=/s/=.*/= $$(\
- ${FETCH_CMD} -qo- \
- https://github.com/${GH_ACCOUNT}/platform_build/raw/${GH_TAGNAME}/core/version_defaults.mk | \
- ${SED} -n 's/^[[:space:]]*PLATFORM_SDK_VERSION := //p' \
- ).0.0-0 \$${VEREXT}/" \
- ${MAKEFILE}
-# https://developer.github.com/v3/repos/commits/#get-a-single-commit
-# Pretend to be curl(1) for pretty-printed JSON to help parse with sed(1)
- @${REINPLACE_CMD} -i '' -e "/^GH_REVISION=/s/:U[^}:]*/:U$$(\
- ${SETENV} HTTP_USER_AGENT=curl ${FETCH_CMD} -qo- \
- https://api.github.com/repos/${GH_ACCOUNT}/${GH_PROJECT}/commits/${GH_TAGNAME} | \
- ${SED} -n '/sha/ { s/.*\"\([0-9a-f]\{12\}\).*/\1/p; q; }' \
- )/" \
- ${.CURDIR}/Makefile
-
.include <bsd.port.mk>
-
-# XXX Work around !target(makesum)
-.ifndef DISTVERSIONSUFFIX
-makesum: update-revision
-.endif
Modified: head/devel/android-tools-adb/distinfo
==============================================================================
--- head/devel/android-tools-adb/distinfo Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/distinfo Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1529542722
-SHA256 (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = b9de23465b304432aa2b585aa66c6bf4841b177f2139b75ca5adc5d917e0ecd6
-SIZE (aosp-mirror-platform_system_core-android-9.0.0_r3_GH0.tar.gz) = 27484684
+TIMESTAMP = 1563393249
+SHA256 (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = cd0f6fe386f07d7aef98cf46a41cef0aa1e8cebfe06f434bb5c88777de4c2643
+SIZE (aosp-mirror-platform_system_core-platform-tools-29.0.2_GH0.tar.gz) = 59909027
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = f35f681e6fad873f3e94b5c2362939741f15f276022717e352bd21a74653704b
-SIZE (aosp-mirror-platform_development-android-9.0.0_r3_GH0.tar.gz) = 59064522
+SHA256 (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = aa40c37fd1cbb1c4a93a0c4ba26468bb47a5837826cb94423f5ca161dd85f118
+SIZE (aosp-mirror-platform_development-platform-tools-29.0.2_GH0.tar.gz) = 56861217
Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/files/Makefile Fri Sep 6 06:30:02 2019 (r511280)
@@ -5,24 +5,14 @@ NOMAN= # DragonFly, NetBSD, OpenBSD
NO_MAN= # FreeBSD
BINDIR?=/usr/bin
FILESDIR?=${DOCDIR}/${PROG}
-VERSION?= 28.0.0-0 ${VEREXT}
FILES= OVERVIEW.TXT SERVICES.TXT SYNC.TXT protocol.txt
SRCS+= adb.cpp
-SRCS+= adb_auth_host.cpp
-SRCS+= adb_client.cpp
SRCS+= adb_io.cpp
SRCS+= adb_listeners.cpp
SRCS+= adb_trace.cpp
SRCS+= adb_utils.cpp
-SRCS+= bugreport.cpp
-SRCS+= commandline.cpp
-SRCS+= console.cpp
-SRCS+= diagnose_usb.cpp
-SRCS+= fdevent.cpp
-SRCS+= file_sync_client.cpp
-SRCS+= line_printer.cpp
SRCS+= services.cpp
SRCS+= shell_service_protocol.cpp
SRCS+= socket_spec.cpp
@@ -30,24 +20,37 @@ SRCS+= ../adb/sockets.cpp
SRCS+= sysdeps_unix.cpp
SRCS+= transport.cpp
SRCS+= transport_local.cpp
-SRCS+= transport_mdns${MDNSEXT}.cpp
SRCS+= transport_usb.cpp
TEST_SRCS+= adb_io_test.cpp
TEST_SRCS+= adb_listeners_test.cpp
TEST_SRCS+= adb_utils_test.cpp
TEST_SRCS+= bugreport_test.cpp
-TEST_SRCS+= fdevent_test.cpp
TEST_SRCS+= shell_service_protocol_test.cpp
TEST_SRCS+= socket_spec_test.cpp
TEST_SRCS+= socket_test.cpp
TEST_SRCS+= sysdeps_test.cpp
TEST_SRCS+= transport_test.cpp
+TEST_SRCS+= types_test.cpp
.PATH: ${.CURDIR}/client
+SRCS+= adb_client.cpp
+SRCS+= adb_install.cpp
+SRCS+= auth.cpp
+SRCS+= bugreport.cpp
+SRCS+= commandline.cpp
+SRCS+= console.cpp
+SRCS+= file_sync_client.cpp
+SRCS+= line_printer.cpp
SRCS+= main.cpp
+SRCS+= transport_mdns${MDNSEXT}.cpp
SRCS+= usb_libusb.cpp
+.PATH: ${.CURDIR}/fdevent
+SRCS+= fdevent.cpp
+SRCS+= fdevent_poll.cpp
+TEST_SRCS+= fdevent_test.cpp
+
.PATH: ${.CURDIR}/sysdeps
SRCS+= errno.cpp
TEST_SRCS+= stat_test.cpp
@@ -56,6 +59,7 @@ TEST_SRCS+= stat_test.cpp
SRCS+= network.cpp
.PATH: ${.CURDIR}/../base
+SRCS+= chrono_utils.cpp
SRCS+= file.cpp
SRCS+= logging.cpp
SRCS+= parsenetaddress.cpp
@@ -71,6 +75,9 @@ TEST_SRCS+= strings_test.cpp
TEST_SRCS+= test_main.cpp
TEST_SRCS+= test_utils.cpp
+.PATH: ${.CURDIR}/../diagnose_usb
+SRCS+= diagnose_usb.cpp
+
.PATH: ${.CURDIR}/../libcrypto_utils
SRCS+= android_pubkey.c
@@ -90,29 +97,31 @@ CPPFLAGS.sockets.cpp+= -o ${.TARGET}
# required by base/file.cpp
.PATH: ${.CURDIR}/../liblog
-SRCS+= config_read.c
-SRCS+= config_write.c
-SRCS+= fake_log_device.c
-SRCS+= fake_writer.c
-SRCS+= local_logger.c
-SRCS+= logger_lock.c
-SRCS+= logger_name.c
-SRCS+= logger_write.c
-SRCS+= logprint.c
-SRCS+= stderr_write.c
+SRCS+= config_read.cpp
+SRCS+= config_write.cpp
+SRCS+= fake_log_device.cpp
+SRCS+= fake_writer.cpp
+SRCS+= logger_lock.cpp
+SRCS+= logger_name.cpp
+SRCS+= logger_write.cpp
+SRCS+= logprint.cpp
+SRCS+= stderr_write.cpp
-CPPFLAGS+= -DADB_VERSION="\"${VERSION}\""
+CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
CPPFLAGS+= -DADB_HOST=1
CPPFLAGS+= -Doff64_t=off_t
+CPPFLAGS+= -Dlseek64=lseek
CPPFLAGS+= -DFAKE_LOG_DEVICE=1
CPPFLAGS+= -I${.CURDIR}
+CPPFLAGS+= -I${.CURDIR}/client
CPPFLAGS+= -I${.CURDIR}/../include
CPPFLAGS+= -I${.CURDIR}/../base/include
+CPPFLAGS+= -I${.CURDIR}/../diagnose_usb/include
CPPFLAGS+= -I${.CURDIR}/../libcrypto_utils/include
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CPPFLAGS+= $$(${PKG_CONFIG} libcrypto --cflags 2>/dev/null)
CPPFLAGS+= $$(${PKG_CONFIG} libusb-1.0 --cflags 2>/dev/null)
-CXXFLAGS+= -std=gnu++14
+CXXFLAGS+= -std=gnu++2a
.ifndef COMPILE.c
CFLAGS+= ${CPPFLAGS}
@@ -147,5 +156,5 @@ beforeinstall:
test: ${PROG}_test
@for f in ${.ALLSRC}; do ./$$f; done
-${PROG}_test: ${OBJS:Nmain.o:Ncommandline.o} ${TEST_OBJS}
+${PROG}_test: ${OBJS:Nmain.o:Nadb_install.o:Ncommandline.o} ${TEST_OBJS}
${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
Added: head/devel/android-tools-adb/files/patch-adb_adb.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_adb.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,22 @@
+--- adb/adb.cpp.orig 2019-07-17 19:54:09 UTC
++++ adb/adb.cpp
+@@ -44,8 +44,19 @@
+ #include <android-base/parsenetaddress.h>
+ #include <android-base/stringprintf.h>
+ #include <android-base/strings.h>
++#ifdef PLATFORM_TOOLS_VERSION
++#include <sys/utsname.h>
++namespace android { namespace build {
++std::string GetBuildNumber() {
++ struct utsname uts;
++ if (uname(&uts) == -1)
++ return "unknown";
++ return uts.sysname;
++}}}
++#else
+ #include <build/version.h>
+ #include <platform_tools_version.h>
++#endif
+
+ #include "adb_auth.h"
+ #include "adb_io.h"
Copied and modified: head/devel/android-tools-adb/files/patch-adb_client_auth.cpp (from r511279, head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp)
==============================================================================
--- head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp Fri Sep 6 06:29:53 2019 (r511279, copy source)
+++ head/devel/android-tools-adb/files/patch-adb_client_auth.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,5 +1,5 @@
---- adb/adb_auth_host.cpp.orig 2016-06-29 23:43:15 UTC
-+++ adb/adb_auth_host.cpp
+--- adb/client/auth.cpp.orig 2019-07-17 19:54:09 UTC
++++ adb/client/auth.cpp
@@ -34,7 +34,9 @@
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
@@ -10,10 +10,11 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/pem.h>
-@@ -70,6 +72,30 @@ static std::string get_user_info() {
- return " " + username + "@" + hostname;
- }
-
+@@ -52,6 +54,30 @@ static std::mutex& g_keys_mutex = *new std::mutex;
+ static std::map<std::string, std::shared_ptr<RSA>>& g_keys =
+ *new std::map<std::string, std::shared_ptr<RSA>>;
+ static std::map<int, std::string>& g_monitored_paths = *new std::map<int, std::string>;
++
+#if !defined(OPENSSL_IS_BORINGSSL)
+// https://boringssl.googlesource.com/boringssl/+/6601402%5E!/
+static int EVP_EncodedLength(size_t *out_len, size_t len) {
@@ -37,7 +38,6 @@
+ return 1;
+}
+#endif
-+
- static bool write_public_keyfile(RSA* private_key, const std::string& private_key_path) {
- uint8_t binary_key_data[ANDROID_PUBKEY_ENCODED_SIZE];
- if (!android_pubkey_encode(private_key, binary_key_data, sizeof(binary_key_data))) {
+
+ static std::string get_user_info() {
+ std::string hostname;
Added: head/devel/android-tools-adb/files/patch-adb_client_commandline.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_client_commandline.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,28 @@
+--- adb/client/commandline.cpp.orig 2019-07-17 19:54:09 UTC
++++ adb/client/commandline.cpp
+@@ -1016,7 +1016,11 @@ static int ppp(int argc, const char** argv) {
+
+ // copy args
+ const char** ppp_args = (const char**)alloca(sizeof(char*) * argc + 1);
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++ ppp_args[0] = "ppp";
++#else
+ ppp_args[0] = "pppd";
++#endif
+ for (i = 2 ; i < argc ; i++) {
+ //argv[2] and beyond become ppp_args[1] and beyond
+ ppp_args[i - 1] = argv[i];
+@@ -1028,8 +1032,13 @@ static int ppp(int argc, const char** argv) {
+ adb_close(STDERR_FILENO);
+ adb_close(fd);
+
++#if defined(__DragonFly__) || defined(__FreeBSD__)
++ execvp("ppp", (char* const*)ppp_args);
++ perror_exit("exec ppp failed");
++#else
+ execvp("pppd", (char* const*)ppp_args);
+ perror_exit("exec pppd failed");
++#endif
+ }
+
+ // parent side
Added: head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,10 @@
+--- adb/fdevent/fdevent.h.orig 2019-07-17 19:54:09 UTC
++++ adb/fdevent/fdevent.h
+@@ -20,6 +20,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
++#include <atomic> // std::atomic<bool> for GCC
+ #include <chrono>
+ #include <deque>
+ #include <functional>
Modified: head/devel/android-tools-adb/files/patch-adb_sysdeps.h
==============================================================================
--- head/devel/android-tools-adb/files/patch-adb_sysdeps.h Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/files/patch-adb_sysdeps.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,25 +1,9 @@
---- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC
+--- adb/sysdeps.h.orig 2019-07-17 19:54:09 UTC
+++ adb/sysdeps.h
-@@ -61,11 +61,13 @@
- #endif
- #endif
+@@ -330,6 +330,11 @@ size_t ParseCompleteUTF8(const char* first, const char
--#ifdef _WIN32
--
-+#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7)
- // Clang-only nullability specifiers
- #define _Nonnull
- #define _Nullable
-+#endif
-+
-+#ifdef _WIN32
+ #include <cutils/sockets.h>
- #include <ctype.h>
- #include <direct.h>
-@@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d
-
- #include <string>
-
+#if defined(__Bitrig__) || defined(__DragonFly__) || \
+ defined(__FreeBSD__) || defined(__OpenBSD__)
+#include <pthread_np.h>
@@ -28,7 +12,7 @@
#define OS_PATH_SEPARATORS "/"
#define OS_PATH_SEPARATOR '/'
#define OS_PATH_SEPARATOR_STR "/"
-@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create
+@@ -516,6 +521,12 @@ inline int adb_socket_get_local_port(borrowed_fd fd) {
static __inline__ int adb_thread_setname(const std::string& name) {
#ifdef __APPLE__
return pthread_setname_np(name.c_str());
@@ -39,5 +23,5 @@
+#elif defined(__NetBSD__)
+ return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str());
#else
- const char *s = name.c_str();
-
+ // Both bionic and glibc's pthread_setname_np fails rather than truncating long strings.
+ // glibc doesn't have strlcpy, so we have to fake it.
Added: head/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_transport__mdns__unsupported.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,21 @@
+--- /dev/null 1970-01-01 00:00:00 UTC
++++ adb/transport_mdns_unsupported.cpp
+@@ -0,0 +1,18 @@
++/*
++ * Copyright (C) 2016 The Android Open Source Project
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ * http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * Unless required by applicable law or agreed to in writing, software
++ * distributed under the License is distributed on an "AS IS" BASIS,
++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
++ * See the License for the specific language governing permissions and
++ * limitations under the License.
++ */
++
++/* For when mDNS discovery is unsupported */
++void init_mdns_transport_discovery(void) {}
Added: head/devel/android-tools-adb/files/patch-adb_types.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_types.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,10 @@
+--- adb/types.h.orig 2019-07-17 19:54:09 UTC
++++ adb/types.h
+@@ -16,6 +16,7 @@
+
+ #pragma once
+
++#include <cstring> // memcpy for GCC
+ #include <algorithm>
+ #include <deque>
+ #include <memory>
Modified: head/devel/android-tools-adb/files/patch-base_file.cpp
==============================================================================
--- head/devel/android-tools-adb/files/patch-base_file.cpp Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/files/patch-base_file.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,17 +1,14 @@
---- base/file.cpp.orig 2017-06-20 10:50:27 UTC
+--- base/file.cpp.orig 2019-07-17 19:54:09 UTC
+++ base/file.cpp
-@@ -19,6 +19,10 @@
- #include <errno.h>
+@@ -20,6 +20,7 @@
#include <fcntl.h>
+ #include <ftw.h>
#include <libgen.h>
-+#include <limits.h> // PATH_MAX
-+#include <stdio.h> // BUFSIZ
-+#include <stdlib.h> // realpath
-+#include <string.h> // strerror
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,6 +39,9 @@
++#include <limits.h> // PATH_MAX for GCC
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -35,6 +36,9 @@
#if defined(__APPLE__)
#include <mach-o/dyld.h>
#endif
@@ -19,9 +16,9 @@
+#include <sys/sysctl.h>
+#endif
#if defined(_WIN32)
+ #include <direct.h>
#include <windows.h>
- #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
+@@ -421,6 +425,23 @@ std::string GetExecutablePath() {
if (result == 0 || result == sizeof(path) - 1) return "";
path[PATH_MAX - 1] = 0;
return path;
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 Fri Sep 6 06:29:53 2019 (r511279)
+++ head/devel/android-tools-adb/files/patch-base_include_android-base_logging.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,15 +1,6 @@
---- base/include/android-base/logging.h.orig 2015-09-29 18:07:07 UTC
+--- base/include/android-base/logging.h.orig 2019-07-17 19:54:09 UTC
+++ base/include/android-base/logging.h
-@@ -25,6 +25,8 @@
- #endif
- #endif
-
-+#include <errno.h>
-+
- #include <functional>
- #include <memory>
- #include <ostream>
-@@ -321,7 +321,7 @@ struct LogAbortAfterFullExpr {
+@@ -350,7 +350,7 @@ struct LogAbortAfterFullExpr {
// DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally
// CHECK should be used unless profiling identifies a CHECK as being in
// performance critical code.
@@ -18,3 +9,14 @@
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
Added: head/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-base_include_android-base_thread__annotations.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,14 @@
+--- base/include/android-base/thread_annotations.h.orig 2019-07-17 19:54:09 UTC
++++ base/include/android-base/thread_annotations.h
+@@ -18,7 +18,11 @@
+
+ #include <mutex>
+
++#ifdef __clang__
+ #define THREAD_ANNOTATION_ATTRIBUTE__(x) __attribute__((x))
++#else
++#define THREAD_ANNOTATION_ATTRIBUTE__(x)
++#endif
+
+ #define CAPABILITY(x) \
+ THREAD_ANNOTATION_ATTRIBUTE__(capability(x))
Copied and modified: head/devel/android-tools-adb/files/patch-base_threads.cpp (from r511279, head/devel/android-tools-adb/files/patch-base_logging.cpp)
==============================================================================
--- head/devel/android-tools-adb/files/patch-base_logging.cpp Fri Sep 6 06:29:53 2019 (r511279, copy source)
+++ head/devel/android-tools-adb/files/patch-base_threads.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,25 +1,7 @@
---- base/logging.cpp.orig 2016-08-08 21:10:17 UTC
-+++ base/logging.cpp
-@@ -25,7 +25,7 @@
- #include <time.h>
-
- // For getprogname(3) or program_invocation_short_name.
--#if defined(__ANDROID__) || defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__GLIBC__)
- #include <stdlib.h>
- #elif defined(__GLIBC__)
- #include <errno.h>
-@@ -35,6 +35,8 @@
- #include <sys/uio.h>
- #endif
-
-+#include <cstring> // strrchr
-+#include <cstdio> // fprintf
- #include <iostream>
- #include <limits>
- #include <sstream>
-@@ -71,6 +72,16 @@
- #include <unistd.h>
+--- base/threads.cpp.orig 2019-07-17 19:54:09 UTC
++++ base/threads.cpp
+@@ -25,6 +25,16 @@
+ #include <syscall.h>
#elif defined(_WIN32)
#include <windows.h>
+#elif defined(__DragonFly__) || defined(__FreeBSD__)
@@ -34,8 +16,8 @@
+#include <stdint.h>
#endif
- #if defined(_WIN32)
-@@ -88,6 +97,16 @@ static thread_id GetThreadId() {
+ namespace android {
+@@ -41,6 +51,16 @@ uint64_t GetThreadId() {
return syscall(__NR_gettid);
#elif defined(_WIN32)
return GetCurrentThreadId();
Copied and modified: head/devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h (from r511279, head/devel/android-tools-adb/files/patch-include_cutils_trace.h)
==============================================================================
--- head/devel/android-tools-adb/files/patch-include_cutils_trace.h Fri Sep 6 06:29:53 2019 (r511279, copy source)
+++ head/devel/android-tools-adb/files/patch-libcutils_include_cutils_trace.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,5 +1,5 @@
---- include/cutils/trace.h.orig 2017-06-20 10:50:27 UTC
-+++ include/cutils/trace.h
+--- libcutils/include/cutils/trace.h.orig 2019-07-17 19:54:09 UTC
++++ libcutils/include/cutils/trace.h
@@ -18,8 +18,14 @@
#define _LIBS_CUTILS_TRACE_H
Added: head/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-liblog_fake__writer.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,12 @@
+--- liblog/fake_writer.cpp.orig 2019-07-17 19:54:09 UTC
++++ liblog/fake_writer.cpp
+@@ -33,8 +33,8 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1,
+
+ struct android_log_transport_write fakeLoggerWrite = {
+ .node = {&fakeLoggerWrite.node, &fakeLoggerWrite.node},
+- .context.priv = &logFds,
+ .name = "fake",
++ .context = { .priv = &logFds }, // GCC
+ .available = NULL,
+ .open = fakeOpen,
+ .close = fakeClose,
Added: head/devel/android-tools-adb/files/patch-liblog_logger.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-liblog_logger.h Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,17 @@
+--- liblog/logger.h.orig 2019-07-17 19:54:09 UTC
++++ liblog/logger.h
+@@ -16,8 +16,14 @@
+
+ #pragma once
+
++#ifdef __cplusplus
++#include <atomic>
++using std::atomic_int;
++using std::atomic_uintptr_t;
++#else
+ #include <stdatomic.h>
+ #include <stdbool.h>
++#endif
+
+ #include <cutils/list.h>
+ #include <log/log.h>
Copied and modified: head/devel/android-tools-adb/files/patch-liblog_logger__write.cpp (from r511279, head/devel/android-tools-adb/files/patch-liblog_logger__write.c)
==============================================================================
--- head/devel/android-tools-adb/files/patch-liblog_logger__write.c Fri Sep 6 06:29:53 2019 (r511279, copy source)
+++ head/devel/android-tools-adb/files/patch-liblog_logger__write.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -1,5 +1,5 @@
---- liblog/logger_write.c.orig 2016-04-16 00:01:39 UTC
-+++ liblog/logger_write.c
+--- liblog/logger_write.cpp.orig 2019-07-17 19:54:09 UTC
++++ liblog/logger_write.cpp
@@ -15,12 +15,12 @@
*/
@@ -9,7 +9,8 @@
#include <string.h>
#include <sys/time.h>
- #ifdef __BIONIC__
+-#ifdef __BIONIC__
++#if defined(__ANDROID__)
+#include <stdatomic.h>
#include <android/set_abort_message.h>
#endif
Added: head/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-liblog_stderr__write.cpp Fri Sep 6 06:30:02 2019 (r511280)
@@ -0,0 +1,12 @@
+--- liblog/stderr_write.cpp.orig 2019-07-17 19:54:09 UTC
++++ liblog/stderr_write.cpp
+@@ -56,8 +56,8 @@ struct stderrContext {
+
+ struct android_log_transport_write stderrLoggerWrite = {
+ .node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node},
+- .context.priv = NULL,
+ .name = "stderr",
++ .context = { .priv = NULL }, // GCC
+ .available = stderrAvailable,
+ .open = stderrOpen,
+ .close = stderrClose,
More information about the svn-ports-all
mailing list