diff options
Diffstat (limited to 'devel/android-tools-adb/files')
5 files changed, 33 insertions, 26 deletions
diff --git a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp index c201a86849dc..e9fa97dc6ed4 100644 --- a/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp +++ b/devel/android-tools-adb/files/patch-adb_bugreport__test.cpp @@ -1,6 +1,23 @@ ---- adb/bugreport_test.cpp.orig 2016-09-28 18:07:09 UTC +--- adb/bugreport_test.cpp.orig 2019-08-13 02:10:58 UTC +++ adb/bugreport_test.cpp -@@ -40,6 +40,7 @@ using ::testing::internal::CaptureStdout +@@ -14,8 +14,6 @@ + * limitations under the License. + */ + +-#include "bugreport.h" +- + #include <gmock/gmock.h> + #include <gtest/gtest.h> + +@@ -24,6 +22,7 @@ + + #include "sysdeps.h" + #include "adb_utils.h" ++#include "bugreport.h" + + using ::testing::_; + using ::testing::Action; +@@ -40,6 +39,7 @@ using ::testing::internal::CaptureStdout; using ::testing::internal::GetCapturedStderr; using ::testing::internal::GetCapturedStdout; @@ -8,7 +25,7 @@ // 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 +@@ -47,6 +47,7 @@ bool do_sync_pull(const std::vector<const char*>& srcs ADD_FAILURE() << "do_sync_pull() should have been mocked"; return false; } diff --git a/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp new file mode 100644 index 000000000000..675ec42dba69 --- /dev/null +++ b/devel/android-tools-adb/files/patch-adb_client_adb__install.cpp @@ -0,0 +1,11 @@ +--- adb/client/adb_install.cpp.orig 2019-08-13 02:10:58 UTC ++++ adb/client/adb_install.cpp +@@ -214,7 +214,7 @@ static int install_app_streamed(int argc, const char** + return 1; + } + +-#ifdef __linux__ ++#if !defined(__APPLE__) && !defined(_WIN32) + posix_fadvise(local_fd.get(), 0, 0, POSIX_FADV_SEQUENTIAL | POSIX_FADV_NOREUSE); + #endif + diff --git a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h b/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h deleted file mode 100644 index bf3766d9bf05..000000000000 --- a/devel/android-tools-adb/files/patch-adb_fdevent_fdevent.h +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/fdevent/fdevent.h.orig 2019-07-17 19:54:09 UTC -+++ adb/fdevent/fdevent.h -@@ -20,6 +20,7 @@ - #include <stddef.h> - #include <stdint.h> - -+#include <atomic> // std::atomic<bool> for GCC - #include <chrono> - #include <deque> - #include <functional> diff --git a/devel/android-tools-adb/files/patch-adb_types.h b/devel/android-tools-adb/files/patch-adb_types.h deleted file mode 100644 index a4b9794ad1d3..000000000000 --- a/devel/android-tools-adb/files/patch-adb_types.h +++ /dev/null @@ -1,10 +0,0 @@ ---- adb/types.h.orig 2019-07-17 19:54:09 UTC -+++ adb/types.h -@@ -16,6 +16,7 @@ - - #pragma once - -+#include <cstring> // memcpy for GCC - #include <algorithm> - #include <deque> - #include <memory> diff --git a/devel/android-tools-adb/files/patch-liblog_logger.h b/devel/android-tools-adb/files/patch-liblog_logger.h index 77c69a4895cf..c446ea70c5c1 100644 --- a/devel/android-tools-adb/files/patch-liblog_logger.h +++ b/devel/android-tools-adb/files/patch-liblog_logger.h @@ -1,6 +1,6 @@ ---- liblog/logger.h.orig 2019-07-17 19:54:09 UTC +--- liblog/logger.h.orig 2019-08-13 02:10:58 UTC +++ liblog/logger.h -@@ -16,8 +16,14 @@ +@@ -16,7 +16,13 @@ #pragma once @@ -10,7 +10,6 @@ +using std::atomic_uintptr_t; +#else #include <stdatomic.h> - #include <stdbool.h> +#endif #include <cutils/list.h> |