diff options
Diffstat (limited to 'devel/android-tools-adb-devel')
| -rw-r--r-- | devel/android-tools-adb-devel/Makefile | 3 | ||||
| -rw-r--r-- | devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp | 18 |
2 files changed, 0 insertions, 21 deletions
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<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); |