--- 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
 }
='id' value='19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'/><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=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>refs</a><a class='active' href='/guix/log/gnu/installer/aux-files'>log</a><a href='/guix/tree/gnu/installer/aux-files?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>tree</a><a href='/guix/commit/gnu/installer/aux-files?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>commit</a><a href='/guix/diff/gnu/installer/aux-files?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/aux-files'>
<input type='hidden' name='id' value='19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'/><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=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>root</a>/<a href='/guix/log/gnu?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>gnu</a>/<a href='/guix/log/gnu/installer?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>installer</a>/<a href='/guix/log/gnu/installer/aux-files?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26'>aux-files</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/gnu/installer/aux-files?id=19b464fcb830b96e0d8c7bc93d3eb4dac851ff26&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-13 23:46:08 +0200'>2019-05-13</span></td><td><a href='/guix/commit/gnu/installer/aux-files?id=76269f6bc4200ef79aa80a8a6160ae269c2a36c9'>installer: Use 'glibc-supported-locales'.</a><span class='msg-avail'>...<span class='msg-tooltip'>The list of locales supported by glibc is now built from source.

* gnu/installer/locale.scm (locale-string-&gt;locale): Add optional
'codeset' parameter and honor it.
(supported-locales-&gt;locales): Rewrite to 'read' from SUPPORTED-LOCALES.
* gnu/installer.scm (compute-locale-step): Pass the result of
'glibc-supported-locales' instead of the "aux-files/SUPPORTED" file.
* gnu/installer/aux-files/SUPPORTED: Remove.
* gnu/local.mk (dist_installer_DATA): Remove it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-17 14:04:20 +0100'>2019-01-17</span></td><td><a href='/guix/commit/gnu/installer/aux-files?id=d0f3a672dcbdfefd3556b6a21985ff0e35eed3be'>gnu: Add graphical installer support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* configure.ac: Require that guile-newt is available.
* gnu/installer.scm: New file.
* gnu/installer/aux-files/logo.txt: New file.
* gnu/installer/build-installer.scm: New file.
* gnu/installer/connman.scm: New file.
* gnu/installer/keymap.scm: New file.
* gnu/installer/locale.scm: New file.
* gnu/installer/newt.scm: New file.
* gnu/installer/newt/ethernet.scm: New file.
* gnu/installer/newt/hostname.scm: New file.
* gnu/installer/newt/keymap.scm: New file.
* gnu/installer/newt/locale.scm: New file.
* gnu/installer/newt/menu.scm: New file.
* gnu/installer/newt/network.scm: New file.
* gnu/installer/newt/page.scm: New file.
* gnu/installer/newt/timezone.scm: New file.
* gnu/installer/newt/user.scm: New file.
* gnu/installer/newt/utils.scm: New file.
* gnu/installer/newt/welcome.scm: New file.
* gnu/installer/newt/wifi.scm: New file.
* gnu/installer/steps.scm: New file.
* gnu/installer/timezone.scm: New file.
* gnu/installer/utils.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add previous files.
* gnu/system.scm: Export %root-account.
* gnu/system/install.scm (%installation-services): Use kmscon instead of linux
VT for all tty.
(installation-os)[users]: Add the graphical installer as shell of the root
account.
[packages]: Add font related packages.
* po/guix/POTFILES.in: Add installer files.
</span></span></td><td>Mathieu Othacehe</td></tr>