--- 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
 }
b101253e5f82c6423f0eb55b307ec839f53'/><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=4bed3b101253e5f82c6423f0eb55b307ec839f53'>refs</a><a class='active' href='/guix/log/.dir-locals.el'>log</a><a href='/guix/tree/.dir-locals.el?id=4bed3b101253e5f82c6423f0eb55b307ec839f53'>tree</a><a href='/guix/commit/.dir-locals.el?id=4bed3b101253e5f82c6423f0eb55b307ec839f53'>commit</a><a href='/guix/diff/.dir-locals.el?id=4bed3b101253e5f82c6423f0eb55b307ec839f53'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/.dir-locals.el'>
<input type='hidden' name='id' value='4bed3b101253e5f82c6423f0eb55b307ec839f53'/><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=4bed3b101253e5f82c6423f0eb55b307ec839f53'>root</a>/<a href='/guix/log/.dir-locals.el?id=4bed3b101253e5f82c6423f0eb55b307ec839f53'>.dir-locals.el</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/.dir-locals.el?id=4bed3b101253e5f82c6423f0eb55b307ec839f53&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-27 22:47:24 +0200'>2019-05-27</span></td><td><a href='/guix/commit/.dir-locals.el?id=66229b04ae0ee05779b93d77900a062b8e0e8770'>publish: Add support for lzip.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-07 00:00:18 +0100'>2019-03-07</span></td><td><a href='/guix/commit/.dir-locals.el?id=a4678c6ba18d8dbd79d931f80426eebf61be7ebe'>database: Make 'register-items' transactional.</a><span class='msg-avail'>...</span></td><td>Caleb Ristvedt</td></tr>
<tr><td><span title='2019-01-11 12:14:38 +0100'>2019-01-11</span></td><td><a href='/guix/commit/.dir-locals.el?id=7804c45b9ce5a8edd06452d828249e588ae26263'>status: Add 'with-status-verbosity'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-10-19 18:28:57 +0200'>2018-10-19</span></td><td><a href='/guix/commit/.dir-locals.el?id=19c924af4f3726688ca155a905ebf1cb9acdfca2'>tests: Run 'guix pack' tests using the external store.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-09-27 23:21:53 +0200'>2018-09-27</span></td><td><a href='/guix/commit/.dir-locals.el?id=dc0f74e5fc26977a3ee6c4f2aa74a141f4359982'>Add (guix status) and use it for pretty colored output.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-06-01 15:35:32 +0200'>2018-06-01</span></td><td><a href='/guix/commit/.dir-locals.el?id=7f9d184d9b688d13ce76eefabaddcfa76bdde2b5'>Add (gnu store database).</a><span class='msg-avail'>...</span></td><td>Caleb Ristvedt</td></tr>
<tr><td><span title='2018-06-01 15:20:54 +0200'>2018-06-01</span></td><td><a href='/guix/commit/.dir-locals.el?id=838e17d8050236a6d3ffde991fb0035412eb3046'>gexp: Add 'with-extensions'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-01-08 10:40:17 +0100'>2018-01-08</span></td><td><a href='/guix/commit/.dir-locals.el?id=f4596f7630ba8d281b972ebd40fd9947ef79e957'>services: guix: Add 'log-compression' option.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-12-01 16:00:14 +0100'>2017-12-01</span></td><td><a href='/guix/commit/.dir-locals.el?id=1fafa2f58732a3fb75258be342c92a2772af2860'>weather: Use (guix progress) for progress report.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-18 11:38:48 +0200'>2017-05-18</span></td><td><a href='/guix/commit/.dir-locals.el?id=22ef06b801b284760b4ffd9587ea1a3dffd31baa'>union: Gracefully handle dangling symlinks in the input.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-04 22:45:53 +0300'>2017-05-04</span></td><td><a href='/guix/commit/.dir-locals.el?id=da99126ca2fc2959189ca7901c328c19cd80ae82'>dir-locals.el: Add 'modify-phases' keywords.</a><span class='msg-avail'>...</span></td><td>Alex Kost</td></tr>
<tr><td><span title='2017-04-18 23:17:17 +0200'>2017-04-18</span></td><td><a href='/guix/commit/.dir-locals.el?id=1563d6c79f759cb9a6cc5561463653f0f184cb36'>Add (guix workers).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-28 18:55:20 +0100'>2017-01-28</span></td><td><a href='/guix/commit/.dir-locals.el?id=f9704f179a5160013c4a401dce3761714bba8e72'>Add (guix memoization).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-10-04 16:37:59 +0200'>2016-10-04</span></td><td><a href='/guix/commit/.dir-locals.el?id=afb325d84227fe84adda60c03a9015d7473c0b85'>Set Emacs config variable sentence-end-double-space.</a><span class='msg-avail'>...</span></td><td>Hartmut Goebel</td></tr>
<tr><td><span title='2016-07-19 00:07:12 +0200'>2016-07-19</span></td><td><a href='/guix/commit/.dir-locals.el?id=721539026dda02e58addbb618f2102b31a2927f8'>Add (guix zlib).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-07-12 22:47:08 +0200'>2016-07-12</span></td><td><a href='/guix/commit/.dir-locals.el?id=0bb9929eaa3f963ae75478e789723f9e8582116b'>gexp: Add 'with-imported-modules' macro.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>