diff options
Diffstat (limited to 'devel/android-tools-adb-devel/files')
5 files changed, 29 insertions, 17 deletions
diff --git a/devel/android-tools-adb-devel/files/Makefile b/devel/android-tools-adb-devel/files/Makefile index b1193d9ada6c..caa45279d558 100644 --- a/devel/android-tools-adb-devel/files/Makefile +++ b/devel/android-tools-adb-devel/files/Makefile @@ -23,7 +23,6 @@ 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 SRCS+= ../adb/sockets.cpp SRCS+= transport.cpp SRCS+= transport_local.cpp @@ -34,6 +33,7 @@ TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= socket_test.cpp +TEST_SRCS+= sysdeps_test.cpp TEST_SRCS+= transport_test.cpp .PATH: ${.CURDIR}/client 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 deleted file mode 100644 index 6ed5ff31cf39..000000000000 --- a/devel/android-tools-adb-devel/files/patch-adb_adb__utils__test.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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_sysdeps.h b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h index 7480e1799b35..8ca18724c86a 100644 --- a/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h +++ b/devel/android-tools-adb-devel/files/patch-adb_sysdeps.h @@ -1,5 +1,21 @@ --- adb/sysdeps.h.orig 2015-09-05 00:01:27 UTC +++ adb/sysdeps.h +@@ -61,11 +61,13 @@ + #endif + #endif + +-#ifdef _WIN32 +- ++#if !defined(__clang__) || __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ < 7) + // Clang-only nullability specifiers + #define _Nonnull + #define _Nullable ++#endif ++ ++#ifdef _WIN32 + + #include <ctype.h> + #include <direct.h> @@ -401,6 +401,11 @@ typedef std::unique_ptr<HANDLE, handle_d #include <string> diff --git a/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp b/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp new file mode 100644 index 000000000000..b640a75485fa --- /dev/null +++ b/devel/android-tools-adb-devel/files/patch-base_parsenetaddress.cpp @@ -0,0 +1,10 @@ +--- base/parsenetaddress.cpp.orig 2016-02-20 02:39:51 UTC ++++ base/parsenetaddress.cpp +@@ -16,6 +16,7 @@ + + #include "android-base/parsenetaddress.h" + ++#include <stdio.h> // sscanf + #include <algorithm> + + #include "android-base/stringprintf.h" diff --git a/devel/android-tools-adb-devel/files/usb_libusb.cpp b/devel/android-tools-adb-devel/files/usb_libusb.cpp index 3b63ed328874..cfed6aa214e6 100644 --- a/devel/android-tools-adb-devel/files/usb_libusb.cpp +++ b/devel/android-tools-adb-devel/files/usb_libusb.cpp @@ -600,8 +600,8 @@ scan_usb_devices() libusb_free_device_list(devs, 1); } -static void * -device_poll_thread(void* unused) +static void +device_poll_thread(void*) { adb_thread_setname("USB scan"); D("device_poll_thread(): Created USB scan thread"); @@ -611,9 +611,6 @@ device_poll_thread(void* unused) kick_disconnected(); scan_usb_devices(); } - - /* never reaching this point */ - return (NULL); } static void |