summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/libutils-remove-damaging-includes.patch
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2018-05-09 20:11:30 +0200
committerDanny Milosavljevic <dannym@scratchpost.org>2018-05-09 22:32:36 +0200
commitbe906ad16e9bf5ab322cc2a79cf934d37a06dcc7 (patch)
treeba0f4c5931995dc18daad26c94866071d313990b /gnu/packages/patches/libutils-remove-damaging-includes.patch
parent055e6fb3eb12b863ce6176f682fee62a36387b24 (diff)
downloadpatches-be906ad16e9bf5ab322cc2a79cf934d37a06dcc7.tar
patches-be906ad16e9bf5ab322cc2a79cf934d37a06dcc7.tar.gz
gnu: Add android-libutils.
* gnu/packages/patches/libutils-add-includes.patch: New file. * gnu/packages/patches/libutils-remove-damaging-includes.patch: New file. * gnu/packages/android.scm (android-platform-system-core): Use them. (android-libutils): New variable. * gnu/local.mk: Add them.
Diffstat (limited to 'gnu/packages/patches/libutils-remove-damaging-includes.patch')
-rw-r--r--gnu/packages/patches/libutils-remove-damaging-includes.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/gnu/packages/patches/libutils-remove-damaging-includes.patch b/gnu/packages/patches/libutils-remove-damaging-includes.patch
new file mode 100644
index 0000000000..7867dd3b80
--- /dev/null
+++ b/gnu/packages/patches/libutils-remove-damaging-includes.patch
@@ -0,0 +1,21 @@
+--- a/include/utils/StrongPointer.h 2018-04-25 18:42:34.321003602 +0200
++++ b/include/utils/StrongPointer.h 2018-04-25 18:42:42.180912201 +0200
+@@ -17,8 +17,6 @@
+ #ifndef ANDROID_STRONG_POINTER_H
+ #define ANDROID_STRONG_POINTER_H
+
+-#include <cutils/atomic.h>
+-
+ #include <stdint.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
+--- a/libutils/Trace.cpp 2018-04-25 20:41:48.775049786 +0200
++++ b/libutils/Trace.cpp 2018-04-25 20:42:13.674744182 +0200
+@@ -21,5 +21,7 @@
+
+ static void traceInit()
+ {
++#if defined(__ANDROID__)
+ ::android::add_sysprop_change_callback(atrace_update_tags, 0);
++#endif
+ }