aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/android-tools/files')
-rw-r--r--dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch30
-rw-r--r--dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch42
-rw-r--r--dev-util/android-tools/files/android-tools-deffilemode.patch14
3 files changed, 0 insertions, 86 deletions
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
deleted file mode 100644
index f3d664e..0000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/adb/sysdeps.h
-+++ b/adb/sysdeps.h
-@@ -66,6 +66,11 @@
- #endif
- #endif
-
-+#ifndef __clang__
-+#define _Nonnull
-+#define _Nullable
-+#endif
-+
- #ifdef _WIN32
-
- // Clang-only nullability specifiers
---- a/libcutils/include/cutils/trace.h
-+++ b/libcutils/include/cutils/trace.h
-@@ -18,7 +18,13 @@
- #define _LIBS_CUTILS_TRACE_H
-
- #include <inttypes.h>
-+// https://gcc.gnu.org/PR60932
-+#ifdef __cplusplus
-+#include <atomic>
-+using namespace std;
-+#else
- #include <stdatomic.h>
-+#endif
- #include <stdbool.h>
- #include <stdint.h>
- #include <stdio.h>
diff --git a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch b/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
deleted file mode 100644
index 4b25964..0000000
--- a/dev-util/android-tools/files/android-tools-8.1.0_p1-musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/base/logging.cpp
-+++ b/base/logging.cpp
-@@ -28,7 +28,7 @@
- // For getprogname(3) or program_invocation_short_name.
- #if defined(__ANDROID__) || defined(__APPLE__)
- #include <stdlib.h>
--#elif defined(__GLIBC__)
-+#elif defined(__linux__)
- #include <errno.h>
- #endif
-
-@@ -90,7 +90,7 @@
- }
-
- namespace {
--#if defined(__GLIBC__)
-+#if defined(__linux__)
- const char* getprogname() {
- return program_invocation_short_name;
- }
---- a/adb/diagnose_usb.cpp 2018-01-29 12:05:10.466834056 -0800
-+++ b/adb/diagnose_usb.cpp 2018-01-29 12:13:20.980825271 -0800
-@@ -33,7 +33,7 @@
- // Returns a message describing any potential problems we find with udev, or an empty string if we
- // can't find plugdev information (i.e. udev is not installed).
- static std::string GetUdevProblem() {
--#if defined(__linux__)
-+#if defined(__GLIBC__)
- errno = 0;
- group* plugdev_group = getgrnam("plugdev");
-
---- a/fastboot/socket.cpp 2018-01-29 12:05:10.493834055 -0800
-+++ b/fastboot/socket.cpp 2018-01-29 12:17:23.666820925 -0800
-@@ -28,6 +28,8 @@
-
- #include "socket.h"
-
-+#include <sys/select.h>
-+
- #include <android-base/errors.h>
- #include <android-base/stringprintf.h>
-
diff --git a/dev-util/android-tools/files/android-tools-deffilemode.patch b/dev-util/android-tools/files/android-tools-deffilemode.patch
deleted file mode 100644
index 12aa988..0000000
--- a/dev-util/android-tools/files/android-tools-deffilemode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur android-tools.orig/core/include/utils/Compat.h android-tools/core/include/utils/Compat.h
---- android-tools.orig/core/include/utils/Compat.h 2017-04-24 11:27:39.697736014 -0700
-+++ android-tools/core/include/utils/Compat.h 2017-04-24 11:45:24.930908371 -0700
-@@ -41,6 +41,10 @@
- #define DEFFILEMODE 0666
- #endif /* _WIN32 */
-
-+#if defined(__linux__) && !defined(__GLIBC__)
-+#define DEFFILEMODE 0666
-+#endif
-+
- #if defined(_WIN32)
- #define ZD "%ld"
- #define ZD_TYPE long