--- a/adb/Android.mk	2018-04-25 23:23:29.527198350 +0200
+++ b/adb/Android.mk	2018-04-25 23:24:25.558632573 +0200
@@ -226,7 +226,7 @@
 LOCAL_SRC_FILES := test_track_devices.cpp
 LOCAL_SANITIZE := $(adb_host_sanitize)
 LOCAL_SHARED_LIBRARIES := libbase
-LOCAL_STATIC_LIBRARIES := libadb libcrypto_static libcutils
+LOCAL_STATIC_LIBRARIES := libadb libbase libcrypto_static libcutils
 LOCAL_LDLIBS += -lrt -ldl -lpthread
 include $(BUILD_HOST_EXECUTABLE)
 endif
@@ -278,6 +278,7 @@
 LOCAL_SANITIZE := $(adb_host_sanitize)
 LOCAL_STATIC_LIBRARIES := \
     libadb \
+    libcutils \
     libbase \
     libcrypto_static \
     libdiagnose_usb \
--- a/adb/sysdeps_test.cpp	2018-05-09 23:58:46.583163684 +0200
+++ b/adb/sysdeps_test.cpp	2018-05-09 23:56:41.356544648 +0200
@@ -17,6 +17,8 @@
 #include <gtest/gtest.h>
 #include <unistd.h>
 #include <atomic>
+#include <climits>
+#include <mutex>
 
 #include "adb_io.h"
 #include "sysdeps.h"
mit' 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=77b37fcb5806a35624c66eee07d86d32a7657899'>refs</a><a class='active' href='/guix/log/gnu/installer/dump.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/installer/dump.scm?id=77b37fcb5806a35624c66eee07d86d32a7657899'>tree</a><a href='/guix/commit/gnu/installer/dump.scm?id=77b37fcb5806a35624c66eee07d86d32a7657899'>commit</a><a href='/guix/diff/gnu/installer/dump.scm?id=77b37fcb5806a35624c66eee07d86d32a7657899'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/dump.scm'>
<input type='hidden' name='id' value='77b37fcb5806a35624c66eee07d86d32a7657899'/><input type='hidden' name='showmsg' value='1'/><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=77b37fcb5806a35624c66eee07d86d32a7657899&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=77b37fcb5806a35624c66eee07d86d32a7657899&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/installer?id=77b37fcb5806a35624c66eee07d86d32a7657899&amp;showmsg=1'>installer</a>/<a href='/guix/log/gnu/installer/dump.scm?id=77b37fcb5806a35624c66eee07d86d32a7657899&amp;showmsg=1'>dump.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/installer/dump.scm?id=77b37fcb5806a35624c66eee07d86d32a7657899'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2022-02-02 16:46:44 +0100'>2022-02-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/dump.scm?id=ad55ccf9b18000144a4e0f28a0f9e57132f94edc'>installer: Make dump archive creation optional and selective.</a></td><td>Josselin Poiret</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/installer.scm (installer-program): Let the installer customize
the dump archive.
* gnu/installer/dump.scm (prepare-dump, make-dump): Split make-dump in
prepare-dump, which copies the files necessary for the dump, and
make-dump which creates the archive.
* gnu/installer/record.scm (installer): Add report-page field.  Change
documented return value of exit-error.
* gnu/installer/newt.scm (exit-error): Change arguments to be a string
containing the error.  Let the user choose between exiting and
initiating a dump.
(report-page): Add new variable.
* gnu/installer/newt/page.scm (run-dump-page): New variable.
* gnu/installer/newt/dump.scm: Delete it.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2022-02-02 16:46:42 +0100'>2022-02-02</span></td><td class='logsubject'><a href='/guix/commit/gnu/installer/dump.scm?id=0d37a5df7e709cadca97cfbbf9c680dfe54b8302'>installer: Add crash dump upload support.</a></td><td>Mathieu Othacehe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Suggested-by: Josselin Poiret &lt;dev@jpoiret.xyz&gt;

* gnu/installer/dump.scm: New file.
* gnu/installer/newt/dump.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* gnu/installer/record.scm (&lt;installer&gt;)[dump-page]: New field.
* gnu/installer/steps.scm (%current-result): New variable.
(run-installer-steps): Update it.
* gnu/installer.scm (installer-program): Add tar and gip to the installer
path. Add guile-webutils and gnutls to the Guile extensions. Generate and send
the crash dump report.
* gnu/installer/newt.scm (exit-error): Add a report argument. Display the
report id.
(dump-page): New procedure.
(newt-installer): Update it.


</td></tr>