6 files changed, 40 insertions, 17 deletions

diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index 834c2f45395c..86ca37adf069 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,14 +1,14 @@
 # $FreeBSD$
 
-# Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-6425
-DISTVERSIONSUFFIX=	-g0fc006685c20
+# Hint: git describe --abbrev=12 --match android-n-preview-3
+DISTVERSION=	n-preview-3-101
+DISTVERSIONSUFFIX=	-g35d84096e9a5
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 GH_MYTAG=	${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
-GH_TAGNAME=	${GH_MYTAG}-1197-g21ac023:extras \
-		${GH_MYTAG}-98-gde7b594:libselinux
+GH_TAGNAME=	${GH_MYTAG}-45-g86bebf8:extras \
+		${GH_MYTAG}:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index 028086c4720c..da61aabdd814 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-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 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66
+SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018
+SHA256 (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 0b08abf97108f7c2a6c56b728ecf8fbc34ec26f6b00e1ee002828eee9d5b7209
+SIZE (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 80661868
+SHA256 (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 3c90521a2f86064cb0968603972f7d1df45621a7407bfd62d5fdc25cd30a70e2
+SIZE (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 63015
 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 cbb33acca054..e798e9acaec7 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -56,9 +56,13 @@ CPPFLAGS.sockets.cpp+=	-o ${.TARGET} # XXX pre-r279980
 
 # required by base and libutils
 .PATH:	${.CURDIR}/../liblog
+SRCS+=	config_write.c
 SRCS+=	fake_log_device.c
-SRCS+=	logd_write.c
-CPPFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
+SRCS+=	fake_writer.c
+SRCS+=	logger_lock.c
+SRCS+=	logger_name.c
+SRCS+=	logger_write.c
+CPPFLAGS.config_write.c+=	-DFAKE_LOG_DEVICE=1
 
 # required by ext4_utils
 .PATH:	${.CURDIR}/../libselinux/src
@@ -70,6 +74,7 @@ SRCS+=	label.c
 SRCS+=	label_android_property.c
 SRCS+=	label_file.c
 SRCS+=	label_support.c
+SRCS+=	regex.c
 CPPFLAGS.label_file.c+=	-D_WITH_GETLINE
 
 # required by fastboot and ext4_utils
diff --git a/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c b/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c
new file mode 100644
index 000000000000..481e87407296
--- /dev/null
+++ b/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c
@@ -0,0 +1,16 @@
+--- liblog/logger_write.c.orig	2016-04-16 00:01:39 UTC
++++ liblog/logger_write.c
+@@ -15,12 +15,12 @@
+  */
+ 
+ #include <errno.h>
+-#include <stdatomic.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
+ 
+ #ifdef __BIONIC__
++#include <stdatomic.h>
+ #include <android/set_abort_message.h>
+ #endif
+ 
diff --git a/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp b/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp
index 3780489b4fea..1eb0ca809ee6 100644
--- a/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp
+++ b/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp
@@ -44,7 +44,7 @@ struct usb_handle {
 
 class LibusbUsbTransport : public Transport {
 public:
-	LibusbUsbTransport(std::unique_ptr<usb_handle> handle):
+	explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle):
 		h(std::move(handle)) {}
 	~LibusbUsbTransport() override = default;
 
diff --git a/devel/android-tools-fastboot-devel/files/util_freebsd.cpp b/devel/android-tools-fastboot-devel/files/util_freebsd.cpp
index e962993e35a9..0734454a9c85 100644
--- a/devel/android-tools-fastboot-devel/files/util_freebsd.cpp
+++ b/devel/android-tools-fastboot-devel/files/util_freebsd.cpp
@@ -30,8 +30,10 @@
 #include <unistd.h>
 #include <limits.h>
 
-void 
-get_my_path(char *path)
+std::string
+get_my_path()
 {
-	getcwd(path, PATH_MAX - 1);
+	char path[PATH_MAX + 1];
+	getcwd(path, sizeof(path) - 1);
+	return path;
 }