svn commit: r448522 - in head/devel: android-tools-adb android-tools-adb-devel android-tools-adb-devel/files android-tools-adb/files android-tools-fastboot android-tools-fastboot-devel/files androi...

Tue Aug 22 13:01:23 UTC 2017

Author: jbeich
Date: Tue Aug 22 13:01:20 2017
New Revision: 448522
URL: https://svnweb.freebsd.org/changeset/ports/448522

Log:
  devel/android-tools-{adb,fastboot}: update to 8.0.0.r4 (oreo)
  
  Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/adb
  Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/fastboot

Added:
  head/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h
  head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp
  head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp   (contents, props changed)
  head/devel/android-tools-adb/files/patch-adb_commandline.h   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-adb_commandline.h
  head/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp   (contents, props changed)
  head/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-adb_sysdeps_posix_network.cpp
  head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-adb_transport__usb.cpp
  head/devel/android-tools-adb/files/patch-adb_usb.h   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-adb_usb.h
  head/devel/android-tools-adb/files/patch-base_file.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-base_file.cpp
  head/devel/android-tools-adb/files/patch-base_file__test.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp
  head/devel/android-tools-adb/files/patch-include_cutils_trace.h   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-include_cutils_trace.h
  head/devel/android-tools-adb/files/patch-libcrypto__utils_android__pubkey.c   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-adb-devel/files/patch-libcrypto__utils_android__pubkey.c
  head/devel/android-tools-fastboot/files/patch-base_file.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
  head/devel/android-tools-fastboot/files/patch-base_logging.cpp   (contents, props changed)
     - copied, changed from r448519, head/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp
Deleted:
  head/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp
  head/devel/android-tools-adb-devel/files/patch-adb_commandline.h
  head/devel/android-tools-adb-devel/files/patch-adb_sysdeps_posix_network.cpp
  head/devel/android-tools-adb-devel/files/patch-adb_transport__usb.cpp
  head/devel/android-tools-adb-devel/files/patch-adb_usb.h
  head/devel/android-tools-adb-devel/files/patch-base_file.cpp
  head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp
  head/devel/android-tools-adb-devel/files/patch-include_cutils_trace.h
  head/devel/android-tools-adb-devel/files/patch-libcrypto__utils_android__pubkey.c
  head/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h
  head/devel/android-tools-adb/files/extra-patch-base_file.cpp
  head/devel/android-tools-adb/files/get_my_path_freebsd.cpp
  head/devel/android-tools-adb/files/usb_libusb.cpp
  head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
  head/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp
Modified:
  head/devel/android-tools-adb-devel/Makefile   (contents, props changed)
  head/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp   (contents, props changed)
  head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h   (contents, props changed)
  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-fastboot/Makefile   (contents, props changed)
  head/devel/android-tools-fastboot/distinfo   (contents, props changed)
  head/devel/android-tools-fastboot/files/Makefile   (contents, props changed)

Modified: head/devel/android-tools-adb-devel/Makefile
==============================================================================

--- head/devel/android-tools-adb-devel/Makefile	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb-devel/Makefile	Tue Aug 22 13:01:20 2017	(r448522)
@@ -15,26 +15,6 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
 
-USES=		compiler:c++14-lang
-
-OPTIONS_DEFINE=	MDNSRESPONDER TEST_PYTHON
-OPTIONS_DEFAULT=MDNSRESPONDER
-
-MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
-MDNSRESPONDER_USES=		localbase:ldflags
-MDNSRESPONDER_LDFLAGS=		-ldns_sd
-MDNSRESPONDER_MAKE_ENV_OFF=	MDNSEXT=_unsupported
-
-TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
-TEST_PYTHON_GH_PROJECT=	platform_development:development
 TEST_PYTHON_GH_TAGNAME=	${GH_MYTAG}-83-gc5efdcc74:development
-TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
-TEST_PYTHON_USES=	python:2.7,build
-
-pre-install-TEST_PYTHON-on:
-# XXX python tests may leave behind running adb server
-	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
-		PYTHONPATH=${WRKSRC_development}/python-packages \
-		${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC}
 
 .include "${MASTERDIR}/Makefile"

Modified: head/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp	Tue Aug 22 13:01:20 2017	(r448522)
@@ -1,26 +1,5 @@
 --- adb/client/usb_libusb.cpp.orig	2017-06-20 10:50:27 UTC
 +++ adb/client/usb_libusb.cpp
-@@ -28,7 +28,7 @@
- #include <thread>
- #include <unordered_map>
- 
--#include <libusb/libusb.h>
-+#include <libusb.h>
- 
- #include <android-base/file.h>
- #include <android-base/logging.h>
-@@ -89,7 +89,11 @@ struct transfer_info {
- };
- 
- namespace libusb {
-+#if defined(__linux__) || defined(__APPLE__)
- struct usb_handle : public ::usb_handle {
-+#else
-+struct usb_handle {
-+#endif
-     usb_handle(const std::string& device_address, const std::string& serial,
-                unique_device_handle&& device_handle, uint8_t interface, uint8_t bulk_in,
-                uint8_t bulk_out, size_t zero_mask, size_t max_packet_size)
 @@ -152,7 +156,14 @@ struct usb_handle : public ::usb_handle {
  static auto& usb_handles = *new std::unordered_map<std::string, std::unique_ptr<usb_handle>>();
  static auto& usb_handles_mutex = *new std::mutex();

Modified: head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h	Tue Aug 22 13:01:20 2017	(r448522)
@@ -1,4 +1,4 @@
---- base/include/android-base/logging.h.orig	2017-07-02 22:55:50 UTC
+--- base/include/android-base/logging.h.orig	2015-09-29 18:07:07 UTC
 +++ base/include/android-base/logging.h
 @@ -321,7 +321,7 @@ struct LogAbortAfterFullExpr {
  // DCHECKs are debug variants of CHECKs only enabled in debug builds. Generally

Modified: head/devel/android-tools-adb/Makefile
==============================================================================
--- head/devel/android-tools-adb/Makefile	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb/Makefile	Tue Aug 22 13:01:20 2017	(r448522)
@@ -2,12 +2,14 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
-DISTVERSION?=	7.1.2_r17
+DISTVERSION?=	8.0.0_r4
 PORTREVISION?=	0
 CATEGORIES=	devel comms
+
 .ifndef EXTRA_PATCHES
-PATCH_SITES=	https://github.com/android/platform_system_core/commit/
-PATCHFILES=	b4cff495a1f9.patch:-p1
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+=	46de1d7f03b7.patch:-p1
+PATCHFILES+=	5d002b8d6ae0.patch:-p1
 .endif
 
 MAINTAINER=	jbeich at FreeBSD.org
@@ -23,17 +25,16 @@ GH_PROJECT=	platform_system_core
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
-GH_REVISION=	1346a4012db4 # generated by: make update-revision
+GH_REVISION=	f6a78079a81a # generated by: make update-revision
 .endif
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
 
 .ifndef EXTRA_PATCHES
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-adb_sysdeps_mutex.h
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-base_file.cpp
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-base_include_android-base_logging.h
 .endif
 
-USES+=		compiler:c++11-lib pkgconfig ssl uidfix
+USES+=		compiler:c++14-lang pkgconfig ssl uidfix
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
@@ -47,7 +48,8 @@ TEST_TARGET=	test
 PLIST_FILES=	bin/adb
 PORTDOCS=	*
 
-OPTIONS_DEFINE+=BASH DOCS TEST
+OPTIONS_DEFINE+=MDNSRESPONDER BASH DOCS TEST TEST_PYTHON
+OPTIONS_DEFAULT=MDNSRESPONDER
 OPTIONS_SUB=	yes
 
 .if make(makesum) # for optional distfiles
@@ -62,11 +64,19 @@ BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi
 
 DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 
+MDNSRESPONDER_LIB_DEPENDS=	libdns_sd.so:net/mDNSResponder
+MDNSRESPONDER_USES=		localbase:ldflags
+MDNSRESPONDER_LDFLAGS=		-ldns_sd
+MDNSRESPONDER_MAKE_ENV_OFF=	MDNSEXT=_unsupported
+
 TEST_BUILD_DEPENDS+=	googlemock>=1.6.0:devel/googlemock \
 			googletest>=1.6.0:devel/googletest
 TEST_ALL_TARGET=	adb_test
 
-pre-install-TEST-on: do-test
+TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
+TEST_PYTHON_GH_PROJECT=	platform_development:development
+TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+TEST_PYTHON_USES=	python:2.7,build
 
 post-patch:
 # XXX Hidden by poudriere/tinderbox, see lindev(4) for FreeBSD < 11.0
@@ -74,6 +84,14 @@ post-patch:
 		${REINPLACE_CMD} -e '/TEST/s/[^ ]*ENOSPC/DISABLED_&/' \
 			${WRKSRC}/adb/adb_io_test.cpp; \
 	fi
+
+pre-install-TEST-on: do-test
+
+pre-install-TEST_PYTHON-on:
+# XXX python tests may leave behind running adb server
+	${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \
+		PYTHONPATH=${WRKSRC_development}/python-packages \
+		${PYTHON_CMD} -m unittest discover -vs ${BUILD_WRKSRC}
 
 post-install-BASH-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${BASH_PLIST_FILES:H}

Modified: head/devel/android-tools-adb/distinfo
==============================================================================
--- head/devel/android-tools-adb/distinfo	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb/distinfo	Tue Aug 22 13:01:20 2017	(r448522)
@@ -1,7 +1,11 @@
-TIMESTAMP = 1495068953
-SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
-SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
+TIMESTAMP = 1498603192
+SHA256 (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 3eb686edb1ccaa7312fb195b65c413823a6d60442d519c499c18b2d18c3094a9
+SIZE (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 5115403
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
-SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50
-SIZE (b4cff495a1f9.patch) = 2066
+SHA256 (android-platform_development-android-8.0.0_r4_GH0.tar.gz) = b6399cc349a332ef818f5041dd39742322bcf96d54663ec8a11e38cb5271096c
+SIZE (android-platform_development-android-8.0.0_r4_GH0.tar.gz) = 93751770
+SHA256 (46de1d7f03b7.patch) = 93bf49a9a93f2b660f39041f8dbd179ea8f1170c1bebeee42f7df1dc1c393579
+SIZE (46de1d7f03b7.patch) = 12346
+SHA256 (5d002b8d6ae0.patch) = 0d105587abea3afbfd320a95be3f8532f213778a6f699150c4d4477334c9eef2
+SIZE (5d002b8d6ae0.patch) = 1385

Modified: head/devel/android-tools-adb/files/Makefile
==============================================================================
--- head/devel/android-tools-adb/files/Makefile	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-adb/files/Makefile	Tue Aug 22 13:01:20 2017	(r448522)
@@ -8,7 +8,6 @@ FILESDIR?=${DOCDIR}/${PROG}
 FILES= *.[Tt][Xx][Tt]
 
 SRCS+= adb.cpp
-SRCS+= adb_auth.cpp
 SRCS+= adb_auth_host.cpp
 SRCS+= adb_client.cpp
 SRCS+= adb_io.cpp
@@ -24,51 +23,62 @@ SRCS+= file_sync_client.cpp
 SRCS+= line_printer.cpp
 SRCS+= services.cpp
 SRCS+= shell_service_protocol.cpp
+SRCS+= socket_spec.cpp
 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
 
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
+SRCS+= usb_libusb.cpp
 
 .PATH: ${.CURDIR}/sysdeps
+SRCS+= errno.cpp
 TEST_SRCS+= stat_test.cpp
 
-.PATH: ${EXTRADIR}
-SRCS+= get_my_path_freebsd.cpp
-SRCS+= usb_libusb.cpp
+.PATH: ${.CURDIR}/sysdeps/posix
+SRCS+= network.cpp
 
 .PATH: ${.CURDIR}/../base
 SRCS+= file.cpp
 SRCS+= logging.cpp
 SRCS+= parsenetaddress.cpp
+SRCS+= quick_exit.cpp
 SRCS+= stringprintf.cpp
 SRCS+= strings.cpp
 TEST_SRCS+= file_test.cpp
 TEST_SRCS+= logging_test.cpp
 TEST_SRCS+= parsenetaddress_test.cpp
+TEST_SRCS+= quick_exit_test.cpp
 TEST_SRCS+= stringprintf_test.cpp
 TEST_SRCS+= strings_test.cpp
 TEST_SRCS+= test_main.cpp
 TEST_SRCS+= test_utils.cpp
 
+.PATH: ${.CURDIR}/../libcrypto_utils
+SRCS+= android_pubkey.c
+
+.PATH: ${.CURDIR}/../libcrypto_utils/tests
+TEST_SRCS+= android_pubkey_test.cpp
+
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= socket_inaddr_any_server_unix.c
 SRCS+= socket_local_client_unix.c
 SRCS+= socket_local_server_unix.c
-SRCS+= socket_loopback_client_unix.c
-SRCS+= socket_loopback_server_unix.c
 SRCS+= socket_network_client_unix.c
 SRCS+= ../libcutils/sockets.cpp
 SRCS+= load_file.c
@@ -78,13 +88,16 @@ 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
-CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1
+SRCS+= logprint.c
+SRCS+= stderr_write.c
 
 REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown)
 
@@ -95,13 +108,15 @@ CPPFLAGS+= -DHAVE_SYMLINKS
 CPPFLAGS+= -DHAVE_TERMIO_H
 CPPFLAGS+= -DHAVE_SYS_SOCKET_H
 CPPFLAGS+= -D_FILE_OFFSET_BITS=64
+CPPFLAGS+= -DFAKE_LOG_DEVICE=1
 CPPFLAGS+= -I${.CURDIR}
 CPPFLAGS+= -I${.CURDIR}/../include
 CPPFLAGS+= -I${.CURDIR}/../base/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++11
+CXXFLAGS+= -std=gnu++14
 
 .ifndef COMPILE.c
 CFLAGS+= ${CPPFLAGS}

Copied and modified: head/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h (from r448519, head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h)
==============================================================================
--- head/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h	Tue Aug 22 12:56:03 2017	(r448519, copy source)
+++ head/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h	Tue Aug 22 13:01:20 2017	(r448522)
@@ -1,11 +1,11 @@
---- base/include/android-base/logging.h.orig	2017-07-02 22:55:50 UTC
+--- base/include/android-base/logging.h.orig	2015-09-29 18:07:07 UTC
 +++ base/include/android-base/logging.h
 @@ -321,7 +321,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.
--#if defined(NDEBUG) && !defined(__clang_analyzer__)
-+#if defined(NDEBUG) && !defined(__clang_analyzer__) || !defined(__ANDROID__)
+-#if defined(NDEBUG)
++#if defined(NDEBUG) || !defined(__ANDROID__)
  static constexpr bool kEnableDChecks = false;
  #else
  static constexpr bool kEnableDChecks = true;

Copied and modified: head/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp (from r448519, head/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp)
==============================================================================

Added: head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp	Tue Aug 22 13:01:20 2017	(r448522)
@@ -0,0 +1,30 @@
+--- adb/client/usb_libusb.cpp.orig	2017-06-20 10:50:27 UTC
++++ adb/client/usb_libusb.cpp
+@@ -22,13 +22,14 @@
+ 
+ #include <atomic>
+ #include <chrono>
++#include <condition_variable>
+ #include <memory>
+ #include <mutex>
+ #include <string>
+ #include <thread>
+ #include <unordered_map>
+ 
+-#include <libusb/libusb.h>
++#include <libusb.h>
+ 
+ #include <android-base/file.h>
+ #include <android-base/logging.h>
+@@ -89,7 +89,11 @@ struct transfer_info {
+ };
+ 
+ namespace libusb {
++#if defined(__linux__) || defined(__APPLE__)
+ struct usb_handle : public ::usb_handle {
++#else
++struct usb_handle {
++#endif
+     usb_handle(const std::string& device_address, const std::string& serial,
+                unique_device_handle&& device_handle, uint8_t interface, uint8_t bulk_in,
+                uint8_t bulk_out, size_t zero_mask, size_t max_packet_size)

Copied and modified: head/devel/android-tools-adb/files/patch-adb_commandline.h (from r448519, head/devel/android-tools-adb-devel/files/patch-adb_commandline.h)
==============================================================================

Added: head/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp	Tue Aug 22 13:01:20 2017	(r448522)
@@ -0,0 +1,10 @@
+--- adb/sysdeps_test.cpp.orig	2017-06-27 22:39:52 UTC
++++ adb/sysdeps_test.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include <atomic>
+ #include <condition_variable>
++#include <mutex>
+ #include <thread>
+ 
+ #include "adb_io.h"

Copied and modified: head/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp (from r448519, head/devel/android-tools-adb-devel/files/patch-adb_sysdeps_posix_network.cpp)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-adb_transport__usb.cpp (from r448519, head/devel/android-tools-adb-devel/files/patch-adb_transport__usb.cpp)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-adb_usb.h (from r448519, head/devel/android-tools-adb-devel/files/patch-adb_usb.h)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-base_file.cpp (from r448519, head/devel/android-tools-adb-devel/files/patch-base_file.cpp)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-base_file__test.cpp (from r448519, head/devel/android-tools-adb-devel/files/patch-base_file__test.cpp)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-include_cutils_trace.h (from r448519, head/devel/android-tools-adb-devel/files/patch-include_cutils_trace.h)
==============================================================================

Copied and modified: head/devel/android-tools-adb/files/patch-libcrypto__utils_android__pubkey.c (from r448519, head/devel/android-tools-adb-devel/files/patch-libcrypto__utils_android__pubkey.c)
==============================================================================

Modified: head/devel/android-tools-fastboot/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/Makefile	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-fastboot/Makefile	Tue Aug 22 13:01:20 2017	(r448522)
@@ -2,7 +2,7 @@
 
 PORTNAME=	android-tools-fastboot
 DISTVERSIONPREFIX=	android-
-DISTVERSION?=	7.1.2_r17
+DISTVERSION?=	8.0.0_r4
 PORTREVISION?=	0
 CATEGORIES=	devel sysutils
 MASTER_SITES=	https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
@@ -22,20 +22,17 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	android jbeich:extras,libselinux
 GH_PROJECT=	platform_system_core platform_system_extras:extras \
 		platform_external_libselinux:libselinux
+GH_TAGNAME?=	android-7.1.2_r17:libselinux
 GH_SUBDIR=	libselinux:libselinux
 
 # Emulate GH_COMMIT without causing desync
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
-GH_REVISION=	1346a4012db4 # generated by: make update-revision
+GH_REVISION=	f6a78079a81a # generated by: make update-revision
 .endif
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
-
-.ifndef EXTRA_PATCHES
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-base_file.cpp
-.endif
 
 USES=		compiler:c++11-lib pkgconfig uidfix
 BUILD_WRKSRC=	${WRKSRC}/fastboot

Modified: head/devel/android-tools-fastboot/distinfo
==============================================================================
--- head/devel/android-tools-fastboot/distinfo	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-fastboot/distinfo	Tue Aug 22 13:01:20 2017	(r448522)
@@ -1,10 +1,10 @@
 TIMESTAMP = 1495068953
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = fb8d053d846f439951c651f205c9c914531d8dace86da60474f6675a92576449
-SIZE (android-platform_system_core-android-7.1.2_r17_GH0.tar.gz) = 1596372
-SHA256 (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = ee97ae3df4eecc0d7fc16d3cb6f016ae1b1f81d7e450e678473c9b4618676b42
-SIZE (jbeich-platform_system_extras-android-7.1.2_r17_GH0.tar.gz) = 79621709
+SHA256 (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 3eb686edb1ccaa7312fb195b65c413823a6d60442d519c499c18b2d18c3094a9
+SIZE (android-platform_system_core-android-8.0.0_r4_GH0.tar.gz) = 5115403
+SHA256 (jbeich-platform_system_extras-android-8.0.0_r4_GH0.tar.gz) = 83d4a27f5ffa434688b62d00fcc33edd352bdc523f8b7fcbc3e8d0c1453b1c41
+SIZE (jbeich-platform_system_extras-android-8.0.0_r4_GH0.tar.gz) = 192575526
 SHA256 (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 659e43d3e14b4f4fe8955975ad268310bfad0529f408fb33342ed70ae0d456c7
 SIZE (jbeich-platform_external_libselinux-android-7.1.2_r17_GH0.tar.gz) = 59763
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c

Modified: head/devel/android-tools-fastboot/files/Makefile
==============================================================================
--- head/devel/android-tools-fastboot/files/Makefile	Tue Aug 22 13:01:11 2017	(r448521)
+++ head/devel/android-tools-fastboot/files/Makefile	Tue Aug 22 13:01:20 2017	(r448522)
@@ -4,7 +4,7 @@ PROG_CXX=fastboot
 BINDIR?=/usr/bin
 FILESDIR?=${DOCDIR}/${PROG}
 
-FILES=	*.[Tt][Xx][Tt]
+FILES=	*.md
 
 SRCS+=	bootimg_utils.cpp
 SRCS+=	engine.cpp
@@ -18,7 +18,6 @@ SRCS+=	util.cpp
 
 .PATH: ${EXTRADIR}
 SRCS+=	usb_freebsd.cpp
-SRCS+=	util_freebsd.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../adb
@@ -28,6 +27,7 @@ SRCS+=	diagnose_usb.cpp
 .PATH: ${.CURDIR}/../base
 SRCS+=	errors_unix.cpp
 SRCS+=	file.cpp
+SRCS+=	logging.cpp
 SRCS+=	parsenetaddress.cpp
 SRCS+=	stringprintf.cpp
 SRCS+=	strings.cpp
@@ -48,6 +48,7 @@ SRCS+=	wipe.c
 
 # required by fastboot
 .PATH: ${.CURDIR}/../libcutils
+SRCS+=	android_get_control_file.cpp
 SRCS+=	../libcutils/sockets.cpp
 SRCS+=	socket_inaddr_any_server_unix.c
 SRCS+=	socket_network_client_unix.c
@@ -56,13 +57,17 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET} # XXX pre-r279980
 
 # required by base and libutils
 .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
-CPPFLAGS.config_write.c+=	-DFAKE_LOG_DEVICE=1
+SRCS+=	logprint.c
+SRCS+=	stderr_write.c
+SRCS+=	test_utils.cpp
 
 # required by ext4_utils
 .PATH:	${.CURDIR}/../libselinux/src
@@ -101,12 +106,13 @@ 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}/../adb
 CPPFLAGS+=	-I${.CURDIR}/../mkbootimg
 CPPFLAGS+=	-I${.CURDIR}/../base/include
-CPPFLAGS+=	-I${.CURDIR}/../ext4_utils
+CPPFLAGS+=	-I${.CURDIR}/../ext4_utils/include
 CPPFLAGS+=	-I${.CURDIR}/../f2fs_utils
 CPPFLAGS+=	-I${.CURDIR}/../libselinux/include
 CPPFLAGS+=	-I${.CURDIR}/../libsparse/include
@@ -123,8 +129,8 @@ CXXFLAGS+=	${CPPFLAGS}
 
 LDADD+=	$$(${PKG_CONFIG} libpcre --libs 2>/dev/null || echo -lpcre)
 LDADD+=	$$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
-LDADD+=	-lz
-DPADD+=	${LIBPCRE} ${LIBUSB} ${LIBZ}
+LDADD+=	-lz \-lpthread
+DPADD+=	${LIBPCRE} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 
 GIT?=		git
 PKG_CONFIG?=	pkg-config

Copied and modified: head/devel/android-tools-fastboot/files/patch-base_file.cpp (from r448519, head/devel/android-tools-fastboot-devel/files/patch-base_file.cpp)
==============================================================================

Copied and modified: head/devel/android-tools-fastboot/files/patch-base_logging.cpp (from r448519, head/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp)
==============================================================================
