--- 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='0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'/><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=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>refs</a><a class='active' href='/guix/log/gnu/build/shepherd.scm'>log</a><a href='/guix/tree/gnu/build/shepherd.scm?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>tree</a><a href='/guix/commit/gnu/build/shepherd.scm?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>commit</a><a href='/guix/diff/gnu/build/shepherd.scm?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/shepherd.scm'>
<input type='hidden' name='id' value='0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'/><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=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>root</a>/<a href='/guix/log/gnu?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>gnu</a>/<a href='/guix/log/gnu/build?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>build</a>/<a href='/guix/log/gnu/build/shepherd.scm?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4'>shepherd.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/gnu/build/shepherd.scm?id=0ece738474b82082a1f2a2cd2ae2bc31d99de9a4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-22 00:31:42 +0100'>2023-12-22</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=ca813173894360edef35a5d98878a3135e99e62a'>shepherd: Remove ‘make-forkexec-constructor/container’.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-09-02 16:32:16 +0530'>2022-09-02</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=3e866e24f05e7e60cbd56a6240cdd2efede6eb4c'>shepherd: Set #o640 permissions for log file of service in container.</a><span class='msg-avail'>...</span></td><td>Arun Isaac</td></tr>
<tr><td><span title='2022-05-01 21:30:35 +0200'>2022-05-01</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=3682bd4003f4c4e313498931c471eeae2efe09b8'>Add (guix least-authority).</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-12 23:40:44 +0200'>2022-04-12</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=e1f0c88ea221d846b5a533c4dc88e99e953af63e'>shepherd: Add #:supplementary-groups.</a><span class='msg-avail'>...</span></td><td>Leo Nikkilä</td></tr>
<tr><td><span title='2022-04-11 00:25:33 +0200'>2022-04-11</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=f42959662765d1cd47137ff5da09086fc6a62e99'>shepherd: 'fork+exec-command/container' always returns a PID.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-11 00:25:33 +0200'>2022-04-11</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=ada530acb1e848daaac027872e6bad067e82207b'>shepherd: 'exec-command*' has a valid default #:directory.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-07 00:08:55 +0200'>2022-04-07</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=938448bf40fc77092859352d2243e2d0c236375f'>shepherd: Adjust 'fork+exec-command/container' for the Shepherd 0.9.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-08-02 14:16:22 -0400'>2021-08-02</span></td><td><a href='/guix/commit/gnu/build/shepherd.scm?id=5b2b834269f74865c8ca6ab5e81f6834228490d4'>build: shepherd: Use autoload to lazily bind Shepherd modules.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>