From 305c06c3e6e36a14e7f9ba47463f5005774dc8ef Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Sat, 29 Oct 2016 05:14:42 +0000 Subject: 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 --- devel/android-tools-adb-devel/Makefile | 3 --- .../files/patch-adb_bugreport__test.cpp | 18 ------------------ devel/android-tools-adb/Makefile | 10 ++++++---- devel/android-tools-adb/distinfo | 6 +++--- devel/android-tools-adb/files/Makefile | 8 ++++++++ .../files/patch-adb_bugreport__test.cpp | 18 ++++++++++++++++++ devel/android-tools-fastboot/Makefile | 4 ++-- devel/android-tools-fastboot/distinfo | 14 +++++++------- 8 files changed, 44 insertions(+), 37 deletions(-) delete mode 100644 devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp create mode 100644 devel/android-tools-adb/files/patch-adb_bugreport__test.cpp diff --git a/devel/android-tools-adb-devel/Makefile b/devel/android-tools-adb-devel/Makefile index c37905b8eeb1..5c63664e8827 100644 --- a/devel/android-tools-adb-devel/Makefile +++ b/devel/android-tools-adb-devel/Makefile @@ -15,11 +15,8 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-* GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} -CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 - OPTIONS_DEFINE= TEST_PYTHON -TEST_BUILD_DEPENDS= googlemock>=1.6.0:devel/googlemock TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} diff --git a/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp b/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp deleted file mode 100644 index c201a86849dc..000000000000 --- a/devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- 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& srcs, const char* dst, bool copy_attrs, -@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector=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& srcs, const char* dst, bool copy_attrs, +@@ -47,6 +48,7 @@ bool do_sync_pull(const std::vector