devel/android-tools-{adb,fastboot}-devel: update to m.p.6425

Changes:	https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/aef26bb1a4ad..aef26bb1a4ad/fastboot

7 files changed, 104 insertions, 12 deletions

diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index f010225105fd..a7c96514a9c4 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,18 +1,19 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-6225
-DISTVERSIONSUFFIX=	-gaef26bb1a4ad
+DISTVERSION=	m-preview-6425
+DISTVERSIONSUFFIX=	-g0fc006685c20
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-1153-gb764f45:extras \
-		${DISTVERSIONFULL:C/-[0-9].*//}-96-g589c5ac:libselinux
+GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-1197-g21ac023:extras \
+		${DISTVERSIONFULL:C/-[0-9].*//}-98-gde7b594:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
 MASTERDIR=	${.CURDIR}/../android-tools-fastboot
-FILESDIR=	${.CURDIR}/files
 DISTINFO_FILE=	${.CURDIR}/distinfo
+FILESDIR=	${.CURDIR}/files
+EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 .include "${MASTERDIR}/Makefile"
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index 427a6e7b75c6..028086c4720c 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -1,10 +1,10 @@
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = be20282d07edffa0301a2ffa524169ec2f27ac99597ec88920343e820d38d824
-SIZE (android-platform_system_core-android-m-preview-6225-gaef26bb1a4ad_GH0.tar.gz) = 1470573
-SHA256 (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = c890a16360c65b126d73736382085e858c7135e7fec918a18aea1c0d29a9deac
-SIZE (jbeich-platform_system_extras-android-m-preview-1153-gb764f45_GH0.tar.gz) = 76537274
-SHA256 (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 6c8bd5123ff5e2f1110ee70cda5d3f396c128c3f92bff71035676fc12c48f81b
-SIZE (jbeich-platform_external_libselinux-android-m-preview-96-g589c5ac_GH0.tar.gz) = 59097
+SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e
+SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347
+SHA256 (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = bf6df99267b76e7a3446f3d4d613bbb1493b3ba43ab87aca99f0ade9d2990163
+SIZE (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = 76589937
+SHA256 (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 6ce79ee148103a59ed16e49fd3b9af80e84e65ec4a4ab0a883c14befd6cc29b6
+SIZE (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 59433
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile
index c1c277bd2351..12a5bd68108e 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -11,6 +11,9 @@ SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
 SRCS+=	fs.cpp
 SRCS+=	protocol.cpp
+SRCS+=	socket.cpp
+SRCS+=	tcp.cpp
+SRCS+=	udp.cpp
 SRCS+=	util.cpp
 
 .PATH: ${EXTRADIR}
@@ -23,9 +26,11 @@ SRCS+=	diagnose_usb.cpp
 
 # required by fastboot, diagnose_usb and libziparchive
 .PATH: ${.CURDIR}/../base
+SRCS+=	errors_unix.cpp
 SRCS+=	file.cpp
-SRCS+=	strings.cpp
+SRCS+=	parsenetaddress.cpp
 SRCS+=	stringprintf.cpp
+SRCS+=	strings.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../ext4_utils
@@ -41,6 +46,14 @@ SRCS+=	make_ext4fs.c
 SRCS+=	sha1.c
 SRCS+=	wipe.c
 
+# required by fastboot
+.PATH: ${.CURDIR}/../libcutils
+SRCS+=	../libcutils/sockets.cpp
+SRCS+=	socket_inaddr_any_server_unix.c
+SRCS+=	socket_network_client_unix.c
+SRCS+=	sockets_unix.cpp
+CPPFLAGS.sockets.cpp+=	-o ${.TARGET} # XXX pre-r279980
+
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
 SRCS+=	fake_log_device.c
diff --git a/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h b/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h
new file mode 100644
index 000000000000..8ca18724c86a
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-adb_sysdeps.h
@@ -0,0 +1,43 @@
+--- adb/sysdeps.h.orig	2015-09-05 00:01:27 UTC
++++ adb/sysdeps.h
+@@ -61,11 +61,13 @@
+ #endif
+ #endif
+ 
+-#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 <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>
++#endif
++
+ #define OS_PATH_SEPARATORS "/"
+ #define OS_PATH_SEPARATOR '/'
+ #define OS_PATH_SEPARATOR_STR "/"
+@@ -627,6 +632,12 @@ static __inline__ bool adb_thread_create
+ static __inline__ int adb_thread_setname(const std::string& name) {
+ #ifdef __APPLE__
+     return pthread_setname_np(name.c_str());
++#elif defined(__Bitrig__) || defined(__DragonFly__) || \
++      defined(__FreeBSD__) || defined(__OpenBSD__)
++    pthread_set_name_np(pthread_self(), name.c_str());
++    return 0;
++#elif defined(__NetBSD__)
++    return pthread_setname_np(pthread_self(), "%s", (void*)name.c_str());
+ #else
+     const char *s = name.c_str();
+ 
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp b/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp
new file mode 100644
index 000000000000..f9ccad0a59b5
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-base_errors__unix.cpp
@@ -0,0 +1,11 @@
+--- base/errors_unix.cpp.orig	2016-02-20 02:39:51 UTC
++++ base/errors_unix.cpp
+@@ -16,7 +16,7 @@
+ 
+ #include "android-base/errors.h"
+ 
+-#include <errno.h>
++#include <string.h>
+ 
+ namespace android {
+ namespace base {
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp b/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp
new file mode 100644
index 000000000000..b640a75485fa
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-base_parsenetaddress.cpp
@@ -0,0 +1,10 @@
+--- base/parsenetaddress.cpp.orig	2016-02-20 02:39:51 UTC
++++ base/parsenetaddress.cpp
+@@ -16,6 +16,7 @@
+ 
+ #include "android-base/parsenetaddress.h"
+ 
++#include <stdio.h> // sscanf
+ #include <algorithm>
+ 
+ #include "android-base/stringprintf.h"
diff --git a/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h b/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h
new file mode 100644
index 000000000000..6b0b4bf20dd5
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-fastboot_socket.h
@@ -0,0 +1,14 @@
+--- fastboot/socket.h.orig	2016-02-20 02:39:51 UTC
++++ fastboot/socket.h
+@@ -41,7 +41,10 @@
+ 
+ #include <android-base/macros.h>
+ #include <cutils/sockets.h>
+-#include <gtest/gtest_prod.h>
++
++// Copied from <gtest/gtest_prod.h>
++#define FRIEND_TEST(test_case_name, test_name)\
++friend class test_case_name##_##test_name##_Test
+ 
+ // Socket interface to be implemented for each platform.
+ class Socket {