--- 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
 }
8c8419d05bf9522d394fea11144cb6bfdfb'/><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=73b248c8419d05bf9522d394fea11144cb6bfdfb'>refs</a><a class='active' href='/guix/log/nix/nix-daemon'>log</a><a href='/guix/tree/nix/nix-daemon?id=73b248c8419d05bf9522d394fea11144cb6bfdfb'>tree</a><a href='/guix/commit/nix/nix-daemon?id=73b248c8419d05bf9522d394fea11144cb6bfdfb'>commit</a><a href='/guix/diff/nix/nix-daemon?id=73b248c8419d05bf9522d394fea11144cb6bfdfb'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/nix-daemon'>
<input type='hidden' name='id' value='73b248c8419d05bf9522d394fea11144cb6bfdfb'/><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=73b248c8419d05bf9522d394fea11144cb6bfdfb'>root</a>/<a href='/guix/log/nix?id=73b248c8419d05bf9522d394fea11144cb6bfdfb'>nix</a>/<a href='/guix/log/nix/nix-daemon?id=73b248c8419d05bf9522d394fea11144cb6bfdfb'>nix-daemon</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/nix/nix-daemon?id=73b248c8419d05bf9522d394fea11144cb6bfdfb&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-04-14 14:48:20 +0200'>2022-04-14</span></td><td><a href='/guix/commit/nix/nix-daemon?id=5f74169e8e03e64a15499866c6a6de9f38d36f2d'>daemon: Support systemd-style socket activation.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/nix-daemon/guix-daemon.cc (SD_LISTEN_FDS_START): New macro.
(systemd_activation_sockets): New function.
(main): Use it.  Remove obsolete 'printMsg' call.
* doc/guix.texi (Invoking guix-daemon): Document socket activation.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-04-03 22:08:33 +0200'>2021-04-03</span></td><td><a href='/guix/commit/nix/nix-daemon?id=222fff253c6c6a3d1def16ed90723d7f2c4f9b89'>daemon: Remove dead code.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Noisytoot on #guix.

* nix/nix-daemon/shared.hh (showManPage): Remove.
* nix/nix-daemon/nix-daemon.cc (printHelp, programId): Remove.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-03-17 12:03:23 +0100'>2021-03-17</span></td><td><a href='/guix/commit/nix/nix-daemon?id=bc3896db25c788c181c7bcd65754e7cd378e9d9f'>daemon: Correctly handle '--discover' with no value.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, we'd get:

  $ guix-daemon --discover
  error: basic_string::_M_construct null not valid

* nix/nix-daemon/guix-daemon.cc (parse_opt): Change second argument to
'settings.set' to properly handle case where ARG is NULL.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-11-29 15:08:26 +0100'>2020-11-29</span></td><td><a href='/guix/commit/nix/nix-daemon?id=79f9dee3c4c0e6d21066f142116a537207ae7ba4'>Use substitute servers on the local network.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/scripts/discover.scm: New file.
* Makefile.am (MODULES): Add it.
* nix/nix-daemon/guix-daemon.cc (options): Add "discover" option,
(parse-opt): parse it,
(main): start "guix discover" process when the option is set.
* guix/scripts/substitute.scm (%local-substitute-urls): New variable,
(substitute-urls): add it.
* gnu/services/base.scm (&lt;guix-configuration&gt;): Add "discover?"
field,
(guix-shepherd-service): honor it.
* doc/guix.texi (Invoking guix-daemon): Document "discover" option,
(Base Services): ditto.
</span></span></td><td>Mathieu Othacehe</td></tr>