5 files changed, 20 insertions, 18 deletions
diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 825f793ad31e..e702f4040a23 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-DISTVERSION=	m-preview-122
-DISTVERSIONSUFFIX=	-g53d504f
+DISTVERSION=	m-preview-190
+DISTVERSIONSUFFIX=	-g683790a
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index d3fa23af1299..21ce81fa004d 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 8d49065aff063fb02cc175c634384eb1dc9ed87b85d16e85f0c70bff01415948
-SIZE (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 1182976
+SHA256 (android-platform_system_core-android-m-preview-190-g683790a_GH0.tar.gz) = 326d855249844a20feee9c5e826a34cf675965d2785ae513c9b5f592d3187faa
+SIZE (android-platform_system_core-android-m-preview-190-g683790a_GH0.tar.gz) = 1185812
 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7
 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index a029081b3841..d2673a348493 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
-DISTVERSION=	m-preview-122
-DISTVERSIONSUFFIX=	-g53d504f
+DISTVERSION=	m-preview-190
+DISTVERSIONSUFFIX=	-g683790a
 PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	m-preview-36-gb9408ad:extras \
-		m-preview-1-g06d4551:libselinux
+GH_TAGNAME=	m-preview-100-gdece0f9:extras \
+		m-preview-6-g6d0b91b:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index 4bec375c6396..c0380f289b60 100644
--- a/devel/android-tools-fastboot-devel/distinfo
+++ b/devel/android-tools-fastboot-devel/distinfo
@@ -2,9 +2,9 @@ SHA256 (bash_completion.d/fastboot?id=2b8cfec) = 12ef37bff8230e5e164e4ef5b9c1be1
 SIZE (bash_completion.d/fastboot?id=2b8cfec) = 3051
 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
 SIZE (fastboot.1?id=706e754) = 5906
-SHA256 (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 8d49065aff063fb02cc175c634384eb1dc9ed87b85d16e85f0c70bff01415948
-SIZE (android-platform_system_core-android-m-preview-122-g53d504f_GH0.tar.gz) = 1182976
-SHA256 (jbeich-platform_system_extras-m-preview-36-gb9408ad_GH0.tar.gz) = 012a17d90652e91d886a3b9e9770390264232e383e7c6278dd3082528f73f3dd
-SIZE (jbeich-platform_system_extras-m-preview-36-gb9408ad_GH0.tar.gz) = 651518
-SHA256 (jbeich-platform_external_libselinux-m-preview-1-g06d4551_GH0.tar.gz) = 14a6193ee80f42752089232b766b3948f3ff0c321c770684163b845ed03b0a77
-SIZE (jbeich-platform_external_libselinux-m-preview-1-g06d4551_GH0.tar.gz) = 50973
+SHA256 (android-platform_system_core-android-m-preview-190-g683790a_GH0.tar.gz) = 326d855249844a20feee9c5e826a34cf675965d2785ae513c9b5f592d3187faa
+SIZE (android-platform_system_core-android-m-preview-190-g683790a_GH0.tar.gz) = 1185812
+SHA256 (jbeich-platform_system_extras-m-preview-100-gdece0f9_GH0.tar.gz) = 39beaaafb7bb903d75eeda4ecc9e8e9a10c37d966c89b0967d617c8ee641b894
+SIZE (jbeich-platform_system_extras-m-preview-100-gdece0f9_GH0.tar.gz) = 666874
+SHA256 (jbeich-platform_external_libselinux-m-preview-6-g6d0b91b_GH0.tar.gz) = 67b529cb3f7281622de3d22618ee0c8674099fb40f6fc01f819848e6d4cb4014
+SIZE (jbeich-platform_external_libselinux-m-preview-6-g6d0b91b_GH0.tar.gz) = 56984
diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile
index 64fcbb34940a..443dd2d1d5b4 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -4,11 +4,11 @@ PROG_CXX=fastboot
 BINDIR?=/usr/bin
 
 SRCS+=	bootimg_utils.cpp
-SRCS+=	engine.c
+SRCS+=	engine.cpp
 SRCS+=	fastboot.cpp
-SRCS+=	fs.c
-SRCS+=	protocol.c
-SRCS+=	util.c
+SRCS+=	fs.cpp
+SRCS+=	protocol.cpp
+SRCS+=	util.cpp
 
 .PATH:	${FILESDIR}
 SRCS+=	usb_freebsd.c
@@ -47,7 +47,9 @@ SRCS+=	init.c
 SRCS+=	label.c
 SRCS+=	label_android_property.c
 SRCS+=	label_file.c
+SRCS+=	label_support.c
 CFLAGS.init.c+=		-DDARWIN # statfs
+CFLAGS.label_file.c+=	-D_WITH_GETLINE
 
 # required by fastboot and ext4_utils
 .PATH:	${.CURDIR}/../libsparse