--- 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
 }
lue='40f378e18a61feef5a7700123976acc3141e386a'/><input type='hidden' name='showmsg' value='1'/><select name='h' onchange='this.form.submit();'>
<option value='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=40f378e18a61feef5a7700123976acc3141e386a'>refs</a><a class='active' href='/guix/log/tests/glob.scm?showmsg=1'>log</a><a href='/guix/tree/tests/glob.scm?id=40f378e18a61feef5a7700123976acc3141e386a'>tree</a><a href='/guix/commit/tests/glob.scm?id=40f378e18a61feef5a7700123976acc3141e386a'>commit</a><a href='/guix/diff/tests/glob.scm?id=40f378e18a61feef5a7700123976acc3141e386a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/glob.scm'>
<input type='hidden' name='id' value='40f378e18a61feef5a7700123976acc3141e386a'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=40f378e18a61feef5a7700123976acc3141e386a&amp;showmsg=1'>root</a>/<a href='/guix/log/tests?id=40f378e18a61feef5a7700123976acc3141e386a&amp;showmsg=1'>tests</a>/<a href='/guix/log/tests/glob.scm?id=40f378e18a61feef5a7700123976acc3141e386a&amp;showmsg=1'>glob.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/glob.scm?id=40f378e18a61feef5a7700123976acc3141e386a'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2018-03-18 22:57:17 +0100'>2018-03-18</span></td><td class='logsubject'><a href='/guix/commit/tests/glob.scm?id=71e08fde28fa335bdba2ec2150fd6663390bba5a'>glob: Add an extra glob pattern compilation stage.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/glob.scm (compile-glob-pattern): Rename to...
(string-&gt;sglob): ... this.
(compile-sglob, string-&gt;compiled-sglob): New procedures.
(glob-match?): Replace '?, 'range, and 'set with a single clause.
* tests/glob.scm (test-compile-glob-pattern): Rename to...
(test-string-&gt;sglob): ... this.  Adjust accordingly.
(test-glob-match): Use 'string-&gt;compiled-sglob' instead of
'compile-glob-pattern'.
* gnu/build/linux-modules.scm (read-module-aliases): Use
'string-&gt;compiled-sglob' instead of 'compile-glob-pattern'.


</td></tr>
<tr class='logheader'><td><span title='2018-03-18 22:35:36 +0100'>2018-03-18</span></td><td class='logsubject'><a href='/guix/commit/tests/glob.scm?id=e914b398af11f909e88a8bc85eeebb0768aacd54'>glob: Support square brackets in patterns.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/glob.scm (wildcard-indices): Remove.
(parse-bracket): New procedure.
(compile-glob-pattern): Rewrite.  Support square brackets for sets and
ranges.
(glob-match?): Support sets and ranges.
* tests/glob.scm (test-compile-glob-pattern)
(test-glob-match): New macros.
Use them to rewrite the existing tests, and add new tests.


</td></tr>
<tr class='logheader'><td><span title='2018-03-02 13:46:25 +0100'>2018-03-02</span></td><td class='logsubject'><a href='/guix/commit/tests/glob.scm?id=f14c933df16ee0faee6bff8004da4e5d3e1caf07'>Add (guix glob).</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* guix/glob.scm, tests/glob.scm: New files.
* Makefile.am (MODULES): Add guix/glob.scm.
(SCM_TESTS): Add tests/glob.scm.


</td></tr>