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

27 files changed, 130 insertions, 750 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 8222400da03f..54b628061fe2 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -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"
diff --git a/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp b/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp
index ad3fd7ea9888..3f3d30c3a003 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp
+++ b/devel/android-tools-adb-devel/files/patch-adb_client_usb__libusb.cpp
@@ -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();
diff --git a/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h b/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h
index 3fc6644c9a6f..c4d3811a48b5 100644
--- a/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h
+++ b/devel/android-tools-adb-devel/files/patch-base_include_android-base_logging.h
@@ -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
diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index d6242d67f81a..e4a65e49ad0c 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -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@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
@@ -75,6 +85,14 @@ post-patch:
 			${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}
 	${INSTALL_DATA} ${WRKSRC_bashcomp}/android \
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index 2fd374a1fb99..0c0e5504e65c 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -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
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index 3a5ef4ffd42c..015102eb24b5 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -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}
diff --git a/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h b/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h
deleted file mode 100644
index 792d29f7f738..000000000000
--- a/devel/android-tools-adb/files/extra-patch-adb_sysdeps_mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
---- adb/sysdeps/mutex.h.orig	2016-06-23 07:04:56 UTC
-+++ adb/sysdeps/mutex.h
-@@ -104,4 +104,6 @@
- 
- }
- 
-+#else
-+#include <mutex>
- #endif
diff --git a/devel/android-tools-adb/files/extra-patch-base_file.cpp b/devel/android-tools-adb/files/extra-patch-base_file.cpp
deleted file mode 100644
index 754b02594d0c..000000000000
--- a/devel/android-tools-adb/files/extra-patch-base_file.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/file.cpp.orig	2016-08-08 21:10:17 UTC
-+++ base/file.cpp
-@@ -21,6 +21,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <cstdio> // BUFSIZ
-+#include <cstring> // strerror
- #include <string>
- 
- #include "android-base/macros.h"  // For TEMP_FAILURE_RETRY on Darwin.
diff --git a/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h b/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h
new file mode 100644
index 000000000000..4d6ff0984562
--- /dev/null
+++ b/devel/android-tools-adb/files/extra-patch-base_include_android-base_logging.h
@@ -0,0 +1,11 @@
+--- 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)
++#if defined(NDEBUG) || !defined(__ANDROID__)
+ static constexpr bool kEnableDChecks = false;
+ #else
+ static constexpr bool kEnableDChecks = true;
diff --git a/devel/android-tools-adb/files/get_my_path_freebsd.cpp b/devel/android-tools-adb/files/get_my_path_freebsd.cpp
deleted file mode 100644
index c935adf1292a..000000000000
--- a/devel/android-tools-adb/files/get_my_path_freebsd.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2009 bsdroid project
- *               Alexey Tarasov <tarasov@dodologics.com>
- *
- * Copyright (C) 2007 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.
- */
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <unistd.h>
-
-void
-get_my_path(char *exe, size_t maxLen)
-{
-    int mib[4] = {
-        CTL_KERN,
-        KERN_PROC,
-        KERN_PROC_PATHNAME,
-        getpid()
-    };
-
-    sysctl(mib, 4, exe, &maxLen, NULL, 0);
-}
diff --git a/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp b/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp
index 2fb3e5335c76..2fb3e5335c76 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_adb__auth__host.cpp
+++ b/devel/android-tools-adb/files/patch-adb_adb__auth__host.cpp
diff --git a/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
new file mode 100644
index 000000000000..438930e32b32
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-adb_client_usb__libusb.cpp
@@ -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)
diff --git a/devel/android-tools-adb-devel/files/patch-adb_commandline.h b/devel/android-tools-adb/files/patch-adb_commandline.h
index ac22e1d11e37..ac22e1d11e37 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_commandline.h
+++ b/devel/android-tools-adb/files/patch-adb_commandline.h
diff --git a/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp b/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp
new file mode 100644
index 000000000000..5b8020400d9a
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-adb_sysdeps__test.cpp
@@ -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"
diff --git a/devel/android-tools-adb-devel/files/patch-adb_sysdeps_posix_network.cpp b/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp
index a99ca23f25d5..a99ca23f25d5 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_sysdeps_posix_network.cpp
+++ b/devel/android-tools-adb/files/patch-adb_sysdeps_posix_network.cpp
diff --git a/devel/android-tools-adb-devel/files/patch-adb_transport__usb.cpp b/devel/android-tools-adb/files/patch-adb_transport__usb.cpp
index cb5cb68a926f..cb5cb68a926f 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_transport__usb.cpp
+++ b/devel/android-tools-adb/files/patch-adb_transport__usb.cpp
diff --git a/devel/android-tools-adb-devel/files/patch-adb_usb.h b/devel/android-tools-adb/files/patch-adb_usb.h
index c38b16752cc2..c38b16752cc2 100644
--- a/devel/android-tools-adb-devel/files/patch-adb_usb.h
+++ b/devel/android-tools-adb/files/patch-adb_usb.h
diff --git a/devel/android-tools-adb-devel/files/patch-base_file.cpp b/devel/android-tools-adb/files/patch-base_file.cpp
index ca20501150a6..ca20501150a6 100644
--- a/devel/android-tools-adb-devel/files/patch-base_file.cpp
+++ b/devel/android-tools-adb/files/patch-base_file.cpp
diff --git a/devel/android-tools-adb-devel/files/patch-base_file__test.cpp b/devel/android-tools-adb/files/patch-base_file__test.cpp
index 91950644efd3..91950644efd3 100644
--- a/devel/android-tools-adb-devel/files/patch-base_file__test.cpp
+++ b/devel/android-tools-adb/files/patch-base_file__test.cpp
diff --git a/devel/android-tools-adb-devel/files/patch-include_cutils_trace.h b/devel/android-tools-adb/files/patch-include_cutils_trace.h
index df785a1e3bd2..df785a1e3bd2 100644
--- a/devel/android-tools-adb-devel/files/patch-include_cutils_trace.h
+++ b/devel/android-tools-adb/files/patch-include_cutils_trace.h
diff --git a/devel/android-tools-adb-devel/files/patch-libcrypto__utils_android__pubkey.c b/devel/android-tools-adb/files/patch-libcrypto__utils_android__pubkey.c
index 0f4172f4b9aa..0f4172f4b9aa 100644
--- a/devel/android-tools-adb-devel/files/patch-libcrypto__utils_android__pubkey.c
+++ b/devel/android-tools-adb/files/patch-libcrypto__utils_android__pubkey.c
diff --git a/devel/android-tools-adb/files/usb_libusb.cpp b/devel/android-tools-adb/files/usb_libusb.cpp
deleted file mode 100644
index abc5522cf2ea..000000000000
--- a/devel/android-tools-adb/files/usb_libusb.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-/*
- * Copyright (C) 2009 bsdroid project
- *               Alexey Tarasov <tarasov@dodologics.com>
- *
- * Copyright (C) 2007 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.
- */
-
-#define TRACE_TAG USB
-
-#include "sysdeps.h"
-
-#include <libusb.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "adb.h"
-#include "transport.h"
-
-ADB_MUTEX_DEFINE( usb_lock );
-static libusb_context *ctx = NULL;
-
-struct usb_handle
-{
-    usb_handle            *prev;
-    usb_handle            *next;
-
-    libusb_device         *dev;
-    libusb_device_handle  *devh;
-    int                   interface;
-    uint8_t               dev_bus;
-    uint8_t               dev_addr;
-
-    int                   zero_mask;
-    unsigned char         end_point_address[2];
-    char                  serial[128];
-
-    adb_cond_t            notify;
-    adb_mutex_t           lock;
-};
-
-static usb_handle handle_list = {
-    .prev = &handle_list,
-    .next = &handle_list,
-};
-
-static void
-usb_cleanup()
-{
-    libusb_exit(ctx);
-}
-
-static void
-report_bulk_libusb_error(int r)
-{
-    switch (r) {
-    case LIBUSB_ERROR_TIMEOUT:
-        D("Transfer timeout");
-        break;
-
-    case LIBUSB_ERROR_PIPE:
-        D("Control request is not supported");
-        break;
-
-    case LIBUSB_ERROR_OVERFLOW:
-        D("Device offered more data");
-        break;
-
-    case LIBUSB_ERROR_NO_DEVICE :
-        D("Device was disconnected");
-        break;
-
-    default:
-        D("Error %d during transfer", r);
-        break;
-    };
-}
-
-static int
-usb_bulk_write(usb_handle *uh, const void *data, int len)
-{
-    int r = 0;
-    int transferred = 0;
-
-    r = libusb_bulk_transfer(uh->devh, uh->end_point_address[1],
-                             (unsigned char *)data, len, &transferred, 0);
-
-    if (r != 0) {
-        D("usb_bulk_write(): ");
-        report_bulk_libusb_error(r);
-        return r;
-    }
-
-    return (transferred);
-}
-
-static int
-usb_bulk_read(usb_handle *uh, void *data, int len)
-{
-    int r = 0;
-    int transferred = 0;
-
-    r = libusb_bulk_transfer(uh->devh, uh->end_point_address[0],
-                             (unsigned char *)data, len,
-                             &transferred, 0);
-
-    if (r != 0) {
-        D("usb_bulk_read(): ");
-        report_bulk_libusb_error(r);
-        return r;
-    }
-
-    return (transferred);
-}
-
-int
-usb_write(usb_handle *uh, const void *_data, int len)
-{
-    unsigned char *data = (unsigned char*) _data;
-    int n;
-    int need_zero = 0;
-
-    if (uh->zero_mask == 1) {
-        if (!(len & uh->zero_mask)) {
-            need_zero = 1;
-        }
-    }
-
-    D("usb_write(): %p:%d -> transport %p", _data, len, uh);
-
-    while (len > 0) {
-        int xfer = (len > 4096) ? 4096 : len;
-
-        n = usb_bulk_write(uh, data, xfer);
-
-        if (n != xfer) {
-            D("usb_write(): failed for transport %p (%d bytes left)", uh, len);
-            return -1;
-        }
-
-        len -= xfer;
-        data += xfer;
-    }
-
-    if (need_zero){
-        n = usb_bulk_write(uh, _data, 0);
-
-        if (n < 0) {
-            D("usb_write(): failed to finish operation for transport %p", uh);
-        }
-        return n;
-    }
-
-    return 0;
-}
-
-int
-usb_read(usb_handle *uh, void *_data, int len)
-{
-    unsigned char *data = (unsigned char*)_data;
-    int n;
-
-    D("usb_read(): %p:%d <- transport %p", _data, len, uh);
-
-    while (len > 0) {
-        int xfer = (len > 4096) ? 4096 : len;
-
-        n = usb_bulk_read(uh, data, xfer);
-
-        if (n != xfer) {
-            if (n > 0) {
-                data += n;
-                len -= n;
-                continue;
-            }
-
-            D("usb_read(): failed for transport %p (%d bytes left)", uh, len);
-            return -1;
-        }
-
-        len -= xfer;
-        data += xfer;
-    }
-
-    return 0;
-}
-
-int
-usb_close(usb_handle *h)
-{
-    D("usb_close(): closing transport %p", h);
-    adb_mutex_lock(&usb_lock);
-
-    h->next->prev = h->prev;
-    h->prev->next = h->next;
-    h->prev = NULL;
-    h->next = NULL;
-
-    libusb_release_interface(h->devh, h->interface);
-    libusb_close(h->devh);
-    libusb_unref_device(h->dev);
-
-    adb_mutex_unlock(&usb_lock);
-
-    free(h);
-
-    return (0);
-}
-
-void
-usb_kick(usb_handle *h)
-{
-    D("usb_kick(): kicking transport %p", h);
-
-    adb_mutex_lock(&h->lock);
-    unregister_usb_transport(h);
-    adb_mutex_unlock(&h->lock);
-
-    h->next->prev = h->prev;
-    h->prev->next = h->next;
-    h->prev = NULL;
-    h->next = NULL;
-
-    libusb_release_interface(h->devh, h->interface);
-    libusb_close(h->devh);
-    libusb_unref_device(h->dev);
-    free(h);
-}
-
-static int
-check_usb_interface(libusb_interface const *interface,
-                    libusb_device_descriptor const *desc,
-                    usb_handle *uh)
-{
-    int e;
-
-    if (interface->num_altsetting == 0) {
-        D("check_usb_interface(): No interface settings");
-        return -1;
-    }
-
-    libusb_interface_descriptor const *idesc = &interface->altsetting[0];
-
-    if (idesc->bNumEndpoints != 2) {
-        D("check_usb_interface(): Interface have not 2 endpoints, ignoring");
-        return -1;
-    }
-
-    for (e = 0; e < idesc->bNumEndpoints; e++) {
-        libusb_endpoint_descriptor const *edesc = &idesc->endpoint[e];
-
-        if (edesc->bmAttributes != LIBUSB_TRANSFER_TYPE_BULK) {
-            D("check_usb_interface(): Endpoint (%u) is not bulk (%u), ignoring",
-              edesc->bmAttributes, LIBUSB_TRANSFER_TYPE_BULK);
-            return -1;
-        }
-
-        if (edesc->bEndpointAddress & LIBUSB_ENDPOINT_IN)
-            uh->end_point_address[0] = edesc->bEndpointAddress;
-        else
-            uh->end_point_address[1] = edesc->bEndpointAddress;
-
-        /* aproto 01 needs 0 termination */
-        if (idesc->bInterfaceProtocol == 0x01) {
-            uh->zero_mask = edesc->wMaxPacketSize - 1;
-            D("check_usb_interface(): Forced Android interface protocol v.1");
-        }
-    }
-
-    D("check_usb_interface(): Device: %04x:%04x "
-      "iclass: %x, isclass: %x, iproto: %x ep: %x/%x-> ",
-      desc->idVendor, desc->idProduct, idesc->bInterfaceClass,
-      idesc->bInterfaceSubClass, idesc->bInterfaceProtocol,
-      uh->end_point_address[0], uh->end_point_address[1]);
-
-    if (!is_adb_interface(desc->idVendor, desc->idProduct,
-                          idesc->bInterfaceClass, idesc->bInterfaceSubClass,
-                          idesc->bInterfaceProtocol))
-    {
-        D("not matches");
-        return -1;
-    }
-
-    D("matches");
-    return 1;
-}
-
-static int
-check_usb_interfaces(libusb_config_descriptor *config,
-                     libusb_device_descriptor *desc,
-                     usb_handle *uh)
-{
-    int i;
-
-    for (i = 0; i < config->bNumInterfaces; ++i) {
-        if (check_usb_interface(&config->interface[i], desc, uh) != -1) {
-            /* found some interface and saved information about it */
-            D("check_usb_interfaces(): Interface %d of %04x:%04x "
-              "matches Android device", i, desc->idVendor,
-              desc->idProduct);
-
-            return  i;
-        }
-    }
-
-    return -1;
-}
-
-static int
-register_device(usb_handle *uh, const char *serial)
-{
-    D("register_device(): Registering %p [%s] as USB transport",
-      uh, serial);
-
-    usb_handle* usb = reinterpret_cast<usb_handle*>(calloc(1, sizeof(usb_handle)));
-    if (usb == nullptr) fatal("couldn't allocate usb_handle");
-    memcpy(usb, uh, sizeof(usb_handle));
-    strcpy(usb->serial, uh->serial);
-
-    adb_cond_init(&usb->notify, 0);
-    adb_mutex_init(&usb->lock, 0);
-
-    adb_mutex_lock(&usb_lock);
-
-    usb->next = &handle_list;
-    usb->prev = handle_list.prev;
-    usb->prev->next = usb;
-    usb->next->prev = usb;
-
-    adb_mutex_unlock(&usb_lock);
-
-    char devpath[64];
-    snprintf(devpath, sizeof(devpath), "ugen%d.%d",
-             uh->dev_bus, uh->dev_addr);
-
-    register_usb_transport(usb, serial, devpath, 1);
-
-    return (1);
-}
-
-static int
-already_registered(usb_handle *uh)
-{
-    usb_handle *usb = NULL;
-    int exists = 0;
-
-    adb_mutex_lock(&usb_lock);
-
-    for (usb = handle_list.next; usb != &handle_list; usb = usb->next) {
-        if ((usb->dev_bus == uh->dev_bus) &&
-            (usb->dev_addr == uh->dev_addr))
-        {
-            exists = 1;
-            break;
-        }
-    }
-
-    adb_mutex_unlock(&usb_lock);
-
-    return exists;
-}
-
-static void
-check_device(libusb_device *dev)
-{
-    usb_handle uh;
-    int i = 0;
-    int found = -1;
-    char serial[256] = {0};
-
-    libusb_device_descriptor desc;
-    libusb_config_descriptor *config = NULL;
-
-    int r = libusb_get_device_descriptor(dev, &desc);
-
-    if (r != LIBUSB_SUCCESS) {
-        D("check_device(): Failed to get device descriptor");
-        return;
-    }
-
-    if ((desc.idVendor == 0) && (desc.idProduct == 0))
-        return;
-
-    D("check_device(): Probing usb device %04x:%04x",
-      desc.idVendor, desc.idProduct);
-
-    if (!is_adb_interface(desc.idVendor, desc.idProduct,
-                          ADB_CLASS, ADB_SUBCLASS, ADB_PROTOCOL))
-    {
-        D("check_device(): Ignored due unknown vendor id");
-        return;
-    }
-
-    uh.dev_bus = libusb_get_bus_number(dev);
-    uh.dev_addr = libusb_get_device_address(dev);
-
-    if (already_registered(&uh)) {
-        D("check_device(): Device (bus: %d, address: %d) "
-          "is already registered", uh.dev_bus, uh.dev_addr);
-        return;
-    }
-
-    D("check_device(): Device bus: %d, address: %d",
-      uh.dev_bus, uh.dev_addr);
-
-    r = libusb_get_active_config_descriptor(dev, &config);
-
-    if (r != 0) {
-        if (r == LIBUSB_ERROR_NOT_FOUND) {
-            D("check_device(): Device %4x:%4x is unconfigured",
-              desc.idVendor, desc.idProduct);
-            return;
-        }
-
-        D("check_device(): Failed to get configuration for %4x:%4x",
-          desc.idVendor, desc.idProduct);
-        return;
-    }
-
-    if (config == NULL) {
-        D("check_device(): Sanity check failed after "
-          "getting active config");
-        return;
-    }
-
-    if (config->interface != NULL) {
-        found = check_usb_interfaces(config, &desc, &uh);
-    }
-
-    /* not needed anymore */
-    libusb_free_config_descriptor(config);
-
-    r = libusb_open(dev, &uh.devh);
-    uh.dev = dev;
-
-    if (r != 0) {
-        switch (r) {
-        case LIBUSB_ERROR_NO_MEM:
-            D("check_device(): Memory allocation problem");
-            break;
-
-        case LIBUSB_ERROR_ACCESS:
-            D("check_device(): Permissions problem, "
-              "current user priveleges are messed up?");
-            break;
-
-        case LIBUSB_ERROR_NO_DEVICE:
-            D("check_device(): Device disconected, bad cable?");
-            break;
-
-        default:
-            D("check_device(): libusb triggered error %d", r);
-        }
-        // skip rest
-        found = -1;
-    }
-
-    if (found >= 0) {
-        D("check_device(): Device matches Android interface");
-        // read the device's serial number
-        memset(serial, 0, sizeof(serial));
-        uh.interface = found;
-
-        r = libusb_claim_interface(uh.devh, uh.interface);
-
-        if (r < 0) {
-            D("check_device(): Failed to claim interface %d",
-              uh.interface);
-
-            goto fail;
-        }
-
-        if (desc.iSerialNumber != 0) {
-            libusb_get_string_descriptor_ascii(uh.devh, desc.iSerialNumber,
-                                               (unsigned char *)uh.serial, sizeof(uh.serial));
-        }
-        if (register_device(&uh, uh.serial) == 0) {
-            D("check_device(): Failed to register device\n");
-            goto fail_interface;
-        }
-    }
-
-    return;
-
-fail_interface:
-    libusb_release_interface(uh.devh, uh.interface);
-
-fail:
-    libusb_close(uh.devh);
-    uh.devh = NULL;
-}
-
-static int
-check_device_connected(usb_handle *uh)
-{
-    int r = libusb_kernel_driver_active(uh->devh, uh->interface);
-
-    if (r == LIBUSB_ERROR_NO_DEVICE)
-        return 0;
-
-    if (r < 0)
-        return -1;
-
-    return 1;
-}
-
-static void
-kick_disconnected()
-{
-    usb_handle *usb = NULL;
-
-    adb_mutex_lock(&usb_lock);
-
-    for (usb = handle_list.next; usb != &handle_list; usb = usb->next) {
-        if (check_device_connected(usb) == 0) {
-            D("kick_disconnected(): Transport %p is not online anymore",
-              usb);
-
-            usb_kick(usb);
-        }
-    }
-
-    adb_mutex_unlock(&usb_lock);
-}
-
-static void
-scan_usb_devices()
-{
-    D("scan_usb_devices(): started");
-
-    libusb_device **devs= NULL;
-    libusb_device *dev= NULL;
-    ssize_t cnt = libusb_get_device_list(ctx, &devs);
-
-    if (cnt < 0) {
-        D("scan_usb_devices(): Failed to get device list (error: %zd)",
-          cnt);
-
-        return;
-    }
-
-    int i = 0;
-
-    while ((dev = devs[i++]) != NULL) {
-        check_device(dev);
-    }
-
-    libusb_free_device_list(devs, 1);
-}
-
-static void
-device_poll_thread(void*)
-{
-    adb_thread_setname("USB scan");
-    D("device_poll_thread(): Created USB scan thread");
-
-    for (;;) {
-        sleep(5);
-        kick_disconnected();
-        scan_usb_devices();
-    }
-}
-
-static void
-sigalrm_handler(int signo)
-{
-    /* nothing */
-}
-
-void
-usb_init()
-{
-    D("usb_init(): started");
-    struct sigaction actions;
-
-    atexit(usb_cleanup);
-    int r = libusb_init(&ctx);
-
-    if (r != LIBUSB_SUCCESS) {
-        fatal_errno("Failed to init libusb");
-    }
-
-    memset(&actions, 0, sizeof(actions));
-
-    sigemptyset(&actions.sa_mask);
-
-    actions.sa_flags = 0;
-    actions.sa_handler = sigalrm_handler;
-
-    sigaction(SIGALRM, &actions, NULL);
-
-    /* initial device scan */
-    scan_usb_devices();
-
-    /* starting USB event polling thread */
-    if (!adb_thread_create(device_poll_thread, nullptr)) {
-        fatal_errno("cannot create USB scan thread");
-    }
-
-    D("usb_init(): finished");
-}
diff --git a/devel/android-tools-fastboot/Makefile b/devel/android-tools-fastboot/Makefile
index 0bc631afddb0..10eae9df3720 100644
--- a/devel/android-tools-fastboot/Makefile
+++ b/devel/android-tools-fastboot/Makefile
@@ -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,21 +22,18 @@ 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
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
diff --git a/devel/android-tools-fastboot/distinfo b/devel/android-tools-fastboot/distinfo
index b6d2b4192644..482481c07268 100644
--- a/devel/android-tools-fastboot/distinfo
+++ b/devel/android-tools-fastboot/distinfo
@@ -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
diff --git a/devel/android-tools-fastboot/files/Makefile b/devel/android-tools-fastboot/files/Makefile
index 35d91180ab89..380a6c2d1db2 100644
--- a/devel/android-tools-fastboot/files/Makefile
+++ b/devel/android-tools-fastboot/files/Makefile
@@ -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
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot/files/patch-base_file.cpp
index ca20501150a6..ca20501150a6 100644
--- a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_file.cpp
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp b/devel/android-tools-fastboot/files/patch-base_logging.cpp
index 10b83f259680..10b83f259680 100644
--- a/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp
+++ b/devel/android-tools-fastboot/files/patch-base_logging.cpp