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

Changes:	https://android.googlesource.com/platform/system/core/+log/f83766079e24..0bb1ce06ea46/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/94c617ccbba4..0bb1ce06ea46/fastboot

8 files changed, 33 insertions, 31 deletions

diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile
index 3e8dd721716a..d831f2abf46b 100644
--- a/devel/android-tools-adb-devel/Makefile
+++ b/devel/android-tools-adb-devel/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-4374
-DISTVERSIONSUFFIX=	-gf83766079e24
-PORTREVISION=	1
+DISTVERSION=	m-preview-5498
+DISTVERSIONSUFFIX=	-g0bb1ce06ea46
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
@@ -17,7 +17,7 @@ OPTIONS_DEFINE=	TEST_PYTHON
 
 TEST_PYTHON_DESC=	${TEST_DESC:S/tests/python &/}
 TEST_PYTHON_GH_PROJECT=	platform_development:development
-TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2091-g6d49ceb:development
+TEST_PYTHON_GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-2403-g084d084:development
 TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock
 TEST_PYTHON_USES=	python:2.7,build
 
diff --git a/devel/android-tools-adb-devel/distinfo b/devel/android-tools-adb-devel/distinfo
index d728a0b82915..322c8175d3c1 100644
--- a/devel/android-tools-adb-devel/distinfo
+++ b/devel/android-tools-adb-devel/distinfo
@@ -1,6 +1,6 @@
-SHA256 (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 099ad3bfb625a52665562291bd822955695046e4c5d68b7f6d5fd39e265a1efd
-SIZE (android-platform_system_core-android-m-preview-4374-gf83766079e24_GH0.tar.gz) = 1365538
+SHA256 (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 6495262da5f639cb76625437c82475c6220cab208666cf739508871ce36e79da
+SIZE (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 1407054
 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc
 SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948
-SHA256 (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = ea74221301367e0f8788cfca585a015c930aa98a5fded23caaed762bafcd3a2f
-SIZE (android-platform_development-android-m-preview-2091-g6d49ceb_GH0.tar.gz) = 126184363
+SHA256 (android-platform_development-android-m-preview-2403-g084d084_GH0.tar.gz) = a7c33bf2708d61ae2e44ff149fac2460f80746e7da936f08b373841be5750102
+SIZE (android-platform_development-android-m-preview-2403-g084d084_GH0.tar.gz) = 183883403
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile
index 4b0466dae430..31a19002c9a1 100644
--- a/devel/android-tools-adb-devel/files/Makefile
+++ b/devel/android-tools-adb-devel/files/Makefile
@@ -19,6 +19,7 @@ SRCS+= commandline.cpp
 SRCS+= console.cpp
 SRCS+= fdevent.cpp
 SRCS+= file_sync_client.cpp
+SRCS+= line_printer.cpp
 SRCS+= services.cpp
 SRCS+= shell_service_protocol.cpp
 # XXX SuffFindDeps may fail to restore suffix lost in transformation
diff --git a/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp
new file mode 100644
index 000000000000..6ed5ff31cf39
--- /dev/null
+++ b/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp
@@ -0,0 +1,11 @@
+--- adb/adb_utils_test.cpp.orig	2015-11-07 17:05:12 UTC
++++ adb/adb_utils_test.cpp
+@@ -194,7 +194,7 @@ TEST(adb_utils, parse_host_and_port) {
+ }
+ 
+ void test_mkdirs(const std::string basepath) {
+-  EXPECT_TRUE(mkdirs(basepath));
++  EXPECT_TRUE(mkdirs(adb_dirname(basepath)));
+   EXPECT_NE(-1, adb_creat(basepath.c_str(), 0600));
+   EXPECT_FALSE(mkdirs(basepath + "/subdir/"));
+ }
diff --git a/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp b/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
deleted file mode 100644
index 9442e9aa10f4..000000000000
--- a/devel/android-tools-adb-devel/files/patch-adb_fdevent.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- adb/fdevent.cpp.orig	2015-09-17 22:58:36 UTC
-+++ adb/fdevent.cpp
-@@ -53,7 +53,7 @@ int SHELL_EXIT_NOTIFY_FD = -1;
- 
- struct PollNode {
-   fdevent* fde;
--  pollfd pollfd;
-+  ::pollfd pollfd; // -fpermissive
- 
-   PollNode(fdevent* fde) : fde(fde) {
-       memset(&pollfd, 0, sizeof(pollfd));
diff --git a/devel/android-tools-fastboot-devel/Makefile b/devel/android-tools-fastboot-devel/Makefile
index f877435d8514..5af4e6f9d757 100644
--- a/devel/android-tools-fastboot-devel/Makefile
+++ b/devel/android-tools-fastboot-devel/Makefile
@@ -1,13 +1,13 @@
 # $FreeBSD$
 
 # Hint: git describe --abbrev=12 --match android-m-preview
-DISTVERSION=	m-preview-1212
-DISTVERSIONSUFFIX=	-g94c617ccbba4
-PORTREVISION=	3
+DISTVERSION=	m-preview-5498
+DISTVERSIONSUFFIX=	-g0bb1ce06ea46
+PORTREVISION=	0
 PKGNAMESUFFIX=	-devel
 
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-195-g7434d1f:extras \
-		${DISTVERSIONFULL:C/-[0-9].*//}-19-g249094f:libselinux
+GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-972-g442e952:extras \
+		${DISTVERSIONFULL:C/-[0-9].*//}-90-ga83098b:libselinux
 
 CONFLICTS_INSTALL=	${PORTNAME}-[0-9]*
 
diff --git a/devel/android-tools-fastboot-devel/distinfo b/devel/android-tools-fastboot-devel/distinfo
index d4119912b591..20cf4cc63b31 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-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c
-SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686
-SHA256 (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = b08cf354cc0e920df937356d8fb024dfae660c2a8fee549c833199e033cb163c
-SIZE (jbeich-platform_system_extras-android-m-preview-195-g7434d1f_GH0.tar.gz) = 76441782
-SHA256 (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 3539bdbe4444e0b84da7f0ef1d0ab9d46cc6af537062c1016a6400bd09397d41
-SIZE (jbeich-platform_external_libselinux-android-m-preview-19-g249094f_GH0.tar.gz) = 58632
+SHA256 (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 6495262da5f639cb76625437c82475c6220cab208666cf739508871ce36e79da
+SIZE (android-platform_system_core-android-m-preview-5498-g0bb1ce06ea46_GH0.tar.gz) = 1407054
+SHA256 (jbeich-platform_system_extras-android-m-preview-972-g442e952_GH0.tar.gz) = 77082c3fae368dda9fe0a7edb2b54cfb3c47a849f5fe3ab160225304e3598e1e
+SIZE (jbeich-platform_system_extras-android-m-preview-972-g442e952_GH0.tar.gz) = 76529760
+SHA256 (jbeich-platform_external_libselinux-android-m-preview-90-ga83098b_GH0.tar.gz) = 05afbdfad4028c4cdc62d1fa831760cded52883749e686a5c0cea5901d5aa33c
+SIZE (jbeich-platform_external_libselinux-android-m-preview-90-ga83098b_GH0.tar.gz) = 58818
 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 21ef0f0fc276..c90b8ac76fdf 100644
--- a/devel/android-tools-fastboot-devel/files/Makefile
+++ b/devel/android-tools-fastboot-devel/files/Makefile
@@ -17,9 +17,10 @@ SRCS+=	util.cpp
 SRCS+=	usb_freebsd.cpp
 SRCS+=	util_freebsd.cpp
 
-# required by libziparchive
+# required by fastboot and libziparchive
 .PATH: ${.CURDIR}/../base
 SRCS+=	file.cpp
+SRCS+=	strings.cpp
 
 # required by fastboot
 .PATH: ${.CURDIR}/../ext4_utils