--- 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"
s='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=e68bfcfda1386b0e48ba002253375778d3a48730'>refs</a><a class='active' href='/guix/log/gnu/packages/calcurse.scm'>log</a><a href='/guix/tree/gnu/packages/calcurse.scm?id=e68bfcfda1386b0e48ba002253375778d3a48730'>tree</a><a href='/guix/commit/gnu/packages/calcurse.scm?id=e68bfcfda1386b0e48ba002253375778d3a48730'>commit</a><a href='/guix/diff/gnu/packages/calcurse.scm?id=e68bfcfda1386b0e48ba002253375778d3a48730'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/calcurse.scm'>
<input type='hidden' name='id' value='e68bfcfda1386b0e48ba002253375778d3a48730'/><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=e68bfcfda1386b0e48ba002253375778d3a48730'>root</a>/<a href='/guix/log/gnu?id=e68bfcfda1386b0e48ba002253375778d3a48730'>gnu</a>/<a href='/guix/log/gnu/packages?id=e68bfcfda1386b0e48ba002253375778d3a48730'>packages</a>/<a href='/guix/log/gnu/packages/calcurse.scm?id=e68bfcfda1386b0e48ba002253375778d3a48730'>calcurse.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/calcurse.scm?id=e68bfcfda1386b0e48ba002253375778d3a48730&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-10-29 20:45:57 -0400'>2018-10-29</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=a2717e698619fed3204db978f954a1195e1d2b4b'>gnu: calcurse: Use HTTPS URLs.</a><span class='msg-avail'>...<span class='msg-tooltip'>Reported by Marco van Hulten &lt;marco@hulten.org&gt;.

* gnu/packages/calcurse.scm (calcurse)[source, home-page]: Use HTTPS URLs.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2018-03-14 09:10:47 +0100'>2018-03-14</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=e4740d7a51177de6ca060411bde638574abf0227'>gnu: calcurse: Update to 4.3.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/calcurse.scm (calcurse): Update to 4.3.0.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-11-04 10:32:30 -0400'>2017-11-04</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=f9c3bd2e0183b777ad3794674a360222c62633b0'>gnu: Generalize the variable name of the test-only tzdata package.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/base.scm (tzdata-2017a): Rename variable to tzdata-for-tests.
* gnu/packages/calcurse.scm (calcurse)[native-inputs, arguments]: Adjust
accordingly.
gnu/packages/glib.scm (glib): Likewise.
* gnu/packages/perl.scm (perl-libtime-parsedate): Adjust accordingly and
add tzdata-for-tests #:disallowed-references.
* gnu/packages/statistics.scm (r-minimal): Adjust accordingly.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-10-25 14:45:43 -0400'>2017-10-25</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=17650569d44efbd6425f0bd93a8ff57f220034ed'>gnu: Fix Leo Famulari's copyright statement in (gnu packages calcurse).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/calcurse.scm: Fix copyright statement.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-10-25 14:44:38 -0400'>2017-10-25</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=a23dbbff1491759924c027fde1f21f29586793a0'>gnu: calcurse: Used the "fixed" test-only tzdata for tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/calcurse.scm (calcurse)[inputs]: Remove tzdata and add ...
[native-inputs]: tzdata-2017a.
[arguments]: Add tzdata-2017a to #:disallowed-references.
</span></span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-06-14 22:16:11 -0500'>2017-06-14</span></td><td><a href='/guix/commit/gnu/packages/calcurse.scm?id=e0c95301658b994d0819a468221609120e6a12d1'>gnu: calcurse: Upgrade to 4.2.2.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/calcurse.scm (calcurse): Upgrade to 4.2.2.
[inputs]: Add tzdata for tests.
[arguments]: Add new 'check-setup' phase.
</span></span></td><td>Eric Bavier</td></tr>