--- 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
 }
1285aac01584aca4f9af3c6b3d1'/><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=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>refs</a><a class='active' href='/guix/log/.gitignore'>log</a><a href='/guix/tree/.gitignore?id=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>tree</a><a href='/guix/commit/.gitignore?id=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>commit</a><a href='/guix/diff/.gitignore?id=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/.gitignore'>
<input type='hidden' name='id' value='a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'/><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=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>root</a>/<a href='/guix/log/.gitignore?id=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1'>.gitignore</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/.gitignore?id=a80cfbdcb96b71285aac01584aca4f9af3c6b3d1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-09-24 10:11:38 +0200'>2019-09-24</span></td><td><a href='/guix/commit/.gitignore?id=11da634a6e64afa2904542e2174aa2a185f9ac3a'>Merge branch 'master' into core-updates</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-18 11:38:14 +0200'>2019-09-18</span></td><td><a href='/guix/commit/.gitignore?id=7bc46ecc34ceb042ff890e5d306d0a2a736e891d'>doc: Add Guix Cookbook.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2019-06-14 22:09:38 +0200'>2019-06-14</span></td><td><a href='/guix/commit/.gitignore?id=92d00ca4661e186022732a47956a2bc0ef16be96'>build: Remove 'gnu/packages/bootstrap' and its binaries.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-04-26 11:21:32 +0200'>2019-04-26</span></td><td><a href='/guix/commit/.gitignore?id=9ca5ff882e2ac4eaab02eb0fde545bd784af478b'>bootstrap: Break automake dependency on generated files.</a><span class='msg-avail'>...</span></td><td>Miguel Ángel Arruga Vivas</td></tr>
<tr><td><span title='2018-11-20 01:42:43 +0100'>2018-11-20</span></td><td><a href='/guix/commit/.gitignore?id=975b7966f592993bce04e3c153f52f2ece402f21'>.gitignore: Re-add 'authenticate' script.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-06-14 11:17:00 +0200'>2018-06-14</span></td><td><a href='/guix/commit/.gitignore?id=ea0a06cee2ba05451f94714a4f913db02efbe92c'>Remove 'guix-register' and its traces.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-12 15:23:34 +0200'>2018-06-12</span></td><td><a href='/guix/commit/.gitignore?id=5909bdc88735c2c1bd9f44eb6a1b518785144292'>.gitignore: Add doc/stamp-[0-9].</a></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-04-19 21:30:30 +0200'>2018-04-19</span></td><td><a href='/guix/commit/.gitignore?id=b9fe8fd662180e64156d2b95a671242c20f0acfc'>gnu: doc: Allow documentation to be translated.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2018-02-13 22:56:49 +0200'>2018-02-13</span></td><td><a href='/guix/commit/.gitignore?id=99f696324271992eb78874f1b697102db6968625'>.gitignore: Add guix-daemon SELinux policy.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>