devel/android-tools-{adb,fastboot}: update to 7.1.0.r4

Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/fastboot

4 files changed, 35 insertions, 7 deletions

diff --git a/devel/android-tools-adb/Makefile b/devel/android-tools-adb/Makefile
index e6cd47c814fb..2ac61c009589 100644
--- a/devel/android-tools-adb/Makefile
+++ b/devel/android-tools-adb/Makefile
@@ -2,8 +2,8 @@
 
 PORTNAME=	android-tools-adb
 DISTVERSIONPREFIX=	android-
-DISTVERSION?=	7.0.0_r1
-PORTREVISION?=	1
+DISTVERSION?=	7.1.0_r4
+PORTREVISION?=	0
 CATEGORIES=	devel
 .ifndef EXTRA_PATCHES
 PATCH_SITES=	https://github.com/android/platform_system_core/commit/
@@ -23,7 +23,7 @@ GH_PROJECT=	platform_system_core
 .ifdef DISTVERSIONSUFFIX
 GH_REVISION=	${DISTVERSIONSUFFIX:S/-g//} # snapshot
 .else
-GH_REVISION=	88f64719d756 # generated by: make update-revision
+GH_REVISION=	75a38b87f304 # generated by: make update-revision
 .endif
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel-*
@@ -37,6 +37,7 @@ USES=		compiler:c++11-lib pkgconfig ssl uidfix
 BUILD_WRKSRC=	${WRKSRC}/adb
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
+CPPFLAGS+=	-D_GLIBCXX_USE_C99 # XXX ports/193528
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
 		FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}"
@@ -61,7 +62,8 @@ BASH_VARS=		LICENSE+=MIT LICENSE_COMB=multi
 
 DOCS_MAKE_ARGS_OFF=	FILES="" FILESDIR=""
 
-TEST_BUILD_DEPENDS+=	googletest>=1.6.0:devel/googletest
+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
diff --git a/devel/android-tools-adb/distinfo b/devel/android-tools-adb/distinfo
index da945a463a94..570cf92e9e13 100644
--- a/devel/android-tools-adb/distinfo
+++ b/devel/android-tools-adb/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1472009581
-SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4
-SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346
+TIMESTAMP = 1477685972
+SHA256 (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 07f61b77c07e588473cac43daf2a36ef213440aa144f1dc0af214f5c7b0529ef
+SIZE (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 1588982
 SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
 SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50
diff --git a/devel/android-tools-adb/files/Makefile b/devel/android-tools-adb/files/Makefile
index 7f0780076180..3a5ef4ffd42c 100644
--- a/devel/android-tools-adb/files/Makefile
+++ b/devel/android-tools-adb/files/Makefile
@@ -15,6 +15,7 @@ SRCS+= adb_io.cpp
 SRCS+= adb_listeners.cpp
 SRCS+= adb_trace.cpp
 SRCS+= adb_utils.cpp
+SRCS+= bugreport.cpp
 SRCS+= commandline.cpp
 SRCS+= console.cpp
 SRCS+= diagnose_usb.cpp
@@ -31,6 +32,7 @@ SRCS+= transport_usb.cpp
 
 TEST_SRCS+= adb_io_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_test.cpp
@@ -40,6 +42,9 @@ TEST_SRCS+= transport_test.cpp
 .PATH: ${.CURDIR}/client
 SRCS+= main.cpp
 
+.PATH: ${.CURDIR}/sysdeps
+TEST_SRCS+= stat_test.cpp
+
 .PATH: ${EXTRADIR}
 SRCS+= get_my_path_freebsd.cpp
 SRCS+= usb_libusb.cpp
@@ -104,6 +109,7 @@ CXXFLAGS+= ${CPPFLAGS}
 .endif
 
 TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
+TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
 CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
 .endfor
@@ -113,12 +119,14 @@ LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
 LDADD+= -lz \-lpthread
 DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
 TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
+TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags)
 
 TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
 CLEANFILES+= ${PROG}_test ${TEST_OBJS}
 
 GIT?= git
 GTEST_CONFIG?= gtest-config
+GMOCK_CONFIG?= gmock-config
 PKG_CONFIG?= pkg-config
 
 beforeinstall:
diff --git a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
new file mode 100644
index 000000000000..c201a86849dc
--- /dev/null
+++ b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
@@ -0,0 +1,18 @@
+--- adb/bugreport_test.cpp.orig	2016-09-28 18:07:09 UTC
++++ adb/bugreport_test.cpp
+@@ -40,6 +40,7 @@ using ::testing::internal::CaptureStdout
+ using ::testing::internal::GetCapturedStderr;
+ using ::testing::internal::GetCapturedStdout;
+ 
++#ifdef __linux__
+ // Empty function so tests don't need to be linked against file_sync_service.cpp, which requires
+ // SELinux and its transitive dependencies...
+ bool do_sync_pull(const std::vector<const char*>& srcs, const char* dst, bool copy_attrs,
+@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector<cons
+     ADD_FAILURE() << "do_sync_pull() should have been mocked";
+     return false;
+ }
++#endif
+ 
+ // Empty functions so tests don't need to be linked against commandline.cpp
+ DefaultStandardStreamsCallback DEFAULT_STANDARD_STREAMS_CALLBACK(nullptr, nullptr);