diff options
Diffstat (limited to 'dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch')
-rw-r--r-- | dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch | 30 |
1 files changed, 0 insertions, 30 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 f3d664ef70a3..000000000000 --- 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> |