2 files changed, 26 insertions, 0 deletions
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);