devel/android-tools-{adb,fastboot}: update to 8.0.0.r4 (oreo)

Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.1.2_r17..android-8.0.0_r4/fastboot

2 files changed, 0 insertions, 97 deletions

diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
deleted file mode 100644
index ca20501150a6..000000000000
--- a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- base/file.cpp.orig	2017-06-20 10:50:27 UTC
-+++ base/file.cpp
-@@ -19,6 +19,10 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <libgen.h>
-+#include <limits.h> // PATH_MAX
-+#include <stdio.h> // BUFSIZ
-+#include <stdlib.h> // realpath
-+#include <string.h> // strerror
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,6 +39,9 @@
- #if defined(__APPLE__)
- #include <mach-o/dyld.h>
- #endif
-+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
-+#include <sys/sysctl.h>
-+#endif
- #if defined(_WIN32)
- #include <windows.h>
- #define O_CLOEXEC O_NOINHERIT
-@@ -251,6 +258,23 @@ std::string GetExecutablePath() {
-   if (result == 0 || result == sizeof(path) - 1) return "";
-   path[PATH_MAX - 1] = 0;
-   return path;
-+#elif defined(KERN_PROC_PATHNAME)
-+  char path[PATH_MAX + 1];
-+  size_t path_len = sizeof(path);
-+  int mib[] = {
-+    CTL_KERN,
-+#if defined(__NetBSD__)
-+    KERN_PROC_ARGS,
-+    -1,
-+    KERN_PROC_PATHNAME,
-+#else
-+    KERN_PROC,
-+    KERN_PROC_PATHNAME,
-+    -1,
-+#endif
-+  };
-+  int rc = sysctl(mib, arraysize(mib), path, &path_len, NULL, 0);
-+  return rc ? "" : path;
- #else
- #error unknown OS
- #endif
diff --git a/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp b/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp
deleted file mode 100644
index 10b83f259680..000000000000
--- a/devel/android-tools-fastboot-devel/files/patch-base_logging.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- base/logging.cpp.orig	2016-08-08 21:10:17 UTC
-+++ base/logging.cpp
-@@ -25,7 +25,7 @@
- #include <time.h>
- 
- // For getprogname(3) or program_invocation_short_name.
--#if defined(__ANDROID__) || defined(__APPLE__)
-+#if !defined(_WIN32) && !defined(__GLIBC__)
- #include <stdlib.h>
- #elif defined(__GLIBC__)
- #include <errno.h>
-@@ -35,6 +35,8 @@
- #include <sys/uio.h>
- #endif
- 
-+#include <cstring> // strrchr
-+#include <cstdio>  // fprintf
- #include <iostream>
- #include <limits>
- #include <sstream>
-@@ -71,6 +72,14 @@
- #include <unistd.h>
- #elif defined(_WIN32)
- #include <windows.h>
-+#elif defined(__DragonFly__)
-+#include <unistd.h>
-+#elif defined(__FreeBSD__)
-+#include <pthread_np.h>
-+#elif defined(__NetBSD__)
-+#include <lwp.h>
-+#else
-+#include <stdint.h>
- #endif
- 
- #if defined(_WIN32)
-@@ -88,6 +97,14 @@ static thread_id GetThreadId() {
-   return syscall(__NR_gettid);
- #elif defined(_WIN32)
-   return GetCurrentThreadId();
-+#elif defined(__DragonFly__)
-+  return lwp_gettid();
-+#elif defined(__NetBSD__)
-+  return _lwp_self();
-+#elif defined(__FreeBSD__)
-+  return pthread_getthreadid_np();
-+#else
-+  return (intptr_t) pthread_self();
- #endif
- }
-