--- 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='54e88d8da5ee1c0591b106b63e1c9437967ab52c'/><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=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>refs</a><a class='active' href='/guix/log/gnu/packages/matrix.scm'>log</a><a href='/guix/tree/gnu/packages/matrix.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>tree</a><a href='/guix/commit/gnu/packages/matrix.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>commit</a><a href='/guix/diff/gnu/packages/matrix.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/matrix.scm'>
<input type='hidden' name='id' value='54e88d8da5ee1c0591b106b63e1c9437967ab52c'/><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=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>root</a>/<a href='/guix/log/gnu?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>gnu</a>/<a href='/guix/log/gnu/packages?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>packages</a>/<a href='/guix/log/gnu/packages/matrix.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c'>matrix.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/packages/matrix.scm?id=54e88d8da5ee1c0591b106b63e1c9437967ab52c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-09-22 01:29:20 +0800'>2023-09-22</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=36821b23b7f5320a6d3926afcff22d2bfe3ed0eb'>gnu: python-cachetools: Update to 5.3.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python-xyz.scm (python-cachetools): Update to 5.3.1.
* gnu/packages/matrix.scm (python-matrix-nio)[arguments]: Add phase to loosen
cachetools requirement.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2023-07-01 08:13:18 +0400'>2023-07-01</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=356c0009d44b91bdec9ba6e9329d877374a3a643'>gnu: python-matrix-nio: Update to 0.20.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/matrix.scm (python-matrix-nio): Update to 0.20.2.

Signed-off-by: Andrew Tropin &lt;andrew@trop.in&gt;
</span></span></td><td>Arjan Adriaanse</td></tr>
<tr><td><span title='2023-04-15 00:09:08 -0400'>2023-04-15</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=929551f634af9752b346043efa4d718796d1efc3'>gnu: python-jsonschema: Update to 4.5.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/python-xyz.scm (python-jsonschema): Update to 4.5.1.
[arguments]: Remove extraneous inputs, outputs bindings from check phase
override.  Add pretend-version phase.
[propagated-inputs]: Add python-importlib-metadata and
python-typing-extensions.  Remove python-six.
* gnu/packages/astronomy.scm (python-asdf): Replace python-jsonschema-next
with python-jsonschema.
(python-asdf-standard, python-gwcs): Likewise.
* gnu/packages/matrix.scm (python-matrix-nio): Likewise.
* gnu/packages/python-xyz.scm (python-robotframework): Likewise.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2023-03-02 10:55:08 +0000'>2023-03-02</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=7df09ee0ab3e7962ef27859ce87e06a323059284'>Merge remote-tracking branch 'savannah/master' into core-updates</a><span class='msg-avail'>...<span class='msg-tooltip'>Conflicts:
	gnu/local.mk
	gnu/packages/autotools.scm
	gnu/packages/cmake.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/haskell.scm
	gnu/packages/pdf.scm
	gnu/packages/python-xyz.scm
	gnu/packages/samba.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/wxwidgets.scm
</span></span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2023-02-11 21:56:28 +0100'>2023-02-11</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=b367f28ed2ac8212d3c8b826b9655a0b2e879f18'>gnu: pantalaimon: Install documentation and use gexps.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/matrix.scm (pantalaimon)[arguments]: Turn into gexps.  Add
install-doc phase.

Signed-off-by: Nicolas Goaziou &lt;mail@nicolasgoaziou.fr&gt;
</span></span></td><td>Morgan Smith</td></tr>
<tr><td><span title='2023-01-30 12:39:40 +0200'>2023-01-30</span></td><td><a href='/guix/commit/gnu/packages/matrix.scm?id=4cf1acc7f3033b50b0bf19e02c9f522d522d338c'>Merge remote-tracking branch 'origin/master' into core-updates</a><span class='msg-avail'>...<span class='msg-tooltip'> Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
</span></span></td><td>Efraim Flashner</td></tr>