--- 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"
jtek'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=4f013b8c8201452aac69221e2bc2f981c9c5026d'>refs</a><a class='active' href='/guix/log/gnu/packages/gps.scm'>log</a><a href='/guix/tree/gnu/packages/gps.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>tree</a><a href='/guix/commit/gnu/packages/gps.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>commit</a><a href='/guix/diff/gnu/packages/gps.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/gps.scm'>
<input type='hidden' name='id' value='4f013b8c8201452aac69221e2bc2f981c9c5026d'/><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=4f013b8c8201452aac69221e2bc2f981c9c5026d'>root</a>/<a href='/guix/log/gnu?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>gnu</a>/<a href='/guix/log/gnu/packages?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>packages</a>/<a href='/guix/log/gnu/packages/gps.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d'>gps.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/gps.scm?id=4f013b8c8201452aac69221e2bc2f981c9c5026d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-06-14 00:24:42 -0400'>2021-06-14</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=ea0a51071e68c37a4c9c25421cf03bc2f442c67b'>gnu: Rename qtbase to qtbase-5.</a><span class='msg-avail'>...<span class='msg-tooltip'>This change was automated via the following command:

$ git ls-files | xargs sed -i 's/,qtbase)/,qtbase-5)/g'
$ git ls-files | xargs sed -i 's/inherit qtbase)/inherit qtbase-5)/g'
$ git ls-files | xargs sed -i 's/package-version qtbase)/package-version qtbase-5)/g'
$ git checkout etc    # to clear some spurious changes

This is done so the qtbase package can be upgraded to version 6 in the
following commit.
</span></span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2021-03-01 11:44:31 +0200'>2021-03-01</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=7ca43b0a1e2215abe0df0708f31decace8e68911'>gnu: gama: Delete bundled pdfs.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gps.scm (gama)[source]: Adjust snippet to also remove
generated PDFs.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-03-01 11:43:06 +0200'>2021-03-01</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=ac17ff0669521f0efec11696ad99f589bebf0f10'>gnu: gama: Update to 2.14.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gps.scm (gama): Update to 2.14.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-17 11:06:28 +0200'>2021-01-17</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=23b8af7962114d80552f09ff2adc4c2f4eabf0f5'>gnu: gama: Update to 2.13.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gps.scm (gama): Update to 2.13.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 11:14:53 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=3b141f2eb9939a0140e0e1cec8ef451a81d9e2dc'>gnu: gpsbabel: Enable tests.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/patches/gps.scm (gpsbabel)[source]: Add patch.
[arguments]: Enable tests.
* gnu/packages/patches/gpsbabel-fix-i686-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 11:14:53 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=d5ecfb491845aee1fb4079fc71d93ba00e4b10be'>gnu: gpsbabel: Unbundle zlib.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gps.scm (gpsbabel)[source]: Adjust snippet to remove
bundled zlib and references from the Makefile.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 11:14:53 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/gps.scm?id=f024a7ba604fb18721a056e65777ae969d8b9681'>gnu: gpsbabel: Update to 1.7.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/gps.scm (gpsbabel): Update to 1.7.0.
[source]: Use git-fetch, remove obsolete patches.
[inputs]: Add libusb.
* gnu/packages/patches/gpsbabel-minizip.patch: Remove file.
* gnu/packages/patches/gpsbabel-qstring.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove entries.

Signed-off-by: Efraim Flashner &lt;efraim@flashner.co.il&gt;
</span></span></td><td>Björn Höfling</td></tr>