aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2018-01-29 11:46:13 -0800
committerAric Belsito <lluixhi@gmail.com>2018-01-29 11:46:13 -0800
commitd5b46cff84ac72a3d067835d2e79bead32659c51 (patch)
tree211052cd3794a4d4042c788132ec9b1f7229e54e /dev-util
parentdev-lang/rust: update metadata.xml (diff)
downloadmusl-d5b46cff84ac72a3d067835d2e79bead32659c51.tar.gz
musl-d5b46cff84ac72a3d067835d2e79bead32659c51.tar.bz2
musl-d5b46cff84ac72a3d067835d2e79bead32659c51.zip
dev-util/android-tools: add build patch
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch30
1 files changed, 30 insertions, 0 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
new file mode 100644
index 0000000..f3d664e
--- /dev/null
+++ b/dev-util/android-tools/files/android-tools-8.1.0_p1-build.patch
@@ -0,0 +1,30 @@
+--- 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>