--- 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='e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'/><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=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>refs</a><a class='active' href='/guix/log/gnu/tests/databases.scm'>log</a><a href='/guix/tree/gnu/tests/databases.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>tree</a><a href='/guix/commit/gnu/tests/databases.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>commit</a><a href='/guix/diff/gnu/tests/databases.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/databases.scm'>
<input type='hidden' name='id' value='e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'/><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=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>root</a>/<a href='/guix/log/gnu?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>gnu</a>/<a href='/guix/log/gnu/tests?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>tests</a>/<a href='/guix/log/gnu/tests/databases.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272'>databases.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/tests/databases.scm?id=e2274ac7c514a1e10ad16e1f9bf1b1e8508f8272&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-05-06 17:12:45 +0200'>2023-05-06</span></td><td><a href='/guix/commit/gnu/tests/databases.scm?id=f51888272558d98cf5c196b93fb6c499056fbf6c'>tests: Add missing module imports for marionette-evaluated code.</a><span class='msg-avail'>...<span class='msg-tooltip'>This missing imports became apparent with commit
a09c7da8f8d8e732f969cf0a09aaa78f87032ab1, which runs the marionette
service in a fresh Guile process with fewer imports.

* gnu/tests/databases.scm (run-postgresql-test, run-timescaledb-test)
(run-mysql-test): Add missing module imports for code passed to
'marionette-eval'.
* gnu/tests/docker.scm (run-docker-test, run-docker-system-test): Likewise.
* gnu/tests/mail.scm (run-dovecot-test, run-getmail-test): Likewise.
* gnu/tests/monitoring.scm (run-zabbix-server-test): Likewise.
* gnu/tests/pam.scm (run-test-pam-limits): Likewise.
* gnu/tests/reconfigure.scm (run-switch-to-system-test)
(run-install-bootloader-test): Likewise.
* gnu/tests/security-token.scm (run-pcscd-test): Likewise.
* gnu/tests/install.scm (gui-test-program): Likewise.
* gnu/tests/telephony.scm (run-jami-test): Add modules to
the #:imported-modules argument of 'marionette-operating-system'.
[test]: Remove them from 'with-imported-modules'; remove
'with-extensions'.  Add "d-bus tooling loaded" test to set up %load-path
and %load-compiled-path so the marionette process can find
guile-ac-d-bus and guile-packrat.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-11-20 21:11:39 +0100'>2022-11-20</span></td><td><a href='/guix/commit/gnu/tests/databases.scm?id=ad6463451128a644970676b0a03d8bb09f02326b'>gnu: MariaDB: Update to 10.10.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/databases.scm (mariadb): Update to 10.9.3.
[source](snippet): Remove adjustments for deprecated TokuDB.
[arguments]: Remove obsolete #:configure-flags.  Build with system libfmt.
Adjust tests for 10.10.2, and mariadb_config file name.  Remove patch phase.
[native-inputs]: Remove obsolete patch.
[inputs]: Add FMT.  Change from OPENSSL-1.1 to OPENSSL.
* gnu/tests/databases.scm (%mysql-os): Adjust config file so MariaDB works on
overlayfs.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-11-20 17:54:04 +0100'>2022-11-20</span></td><td><a href='/guix/commit/gnu/tests/databases.scm?id=96efebed249944be4f4ddfba53ca2f983e4d5e46'>tests: mysql: Wait for the socket before running queries.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/databases.scm (run-mysql-test): Add socket test.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-01-29 16:09:03 +0100'>2022-01-29</span></td><td><a href='/guix/commit/gnu/tests/databases.scm?id=b6b0cfa2f87ef8d151bf8672c7d711afad71a3e7'>tests: Add system test for TimescaleDB.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/databases.scm (%timescaledb-os, run-timescaledb-test,
%test-timescaledb): New variables.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2022-01-29 16:09:03 +0100'>2022-01-29</span></td><td><a href='/guix/commit/gnu/tests/databases.scm?id=765be3dcefff109b9e1e2309a2d0017009b29ead'>tests: postgresql: Test the default PostgreSQL.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/databases.scm (%postgresql-os): Change from POSTGRESQL-10 to
POSTGRESQL.
</span></span></td><td>Marius Bakke</td></tr>