--- 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"
 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=e32cc011bbe899fda432906776702f74fa6b1450'>refs</a><a class='active' href='/guix/log/tests/gremlin.scm'>log</a><a href='/guix/tree/tests/gremlin.scm?id=e32cc011bbe899fda432906776702f74fa6b1450'>tree</a><a href='/guix/commit/tests/gremlin.scm?id=e32cc011bbe899fda432906776702f74fa6b1450'>commit</a><a href='/guix/diff/tests/gremlin.scm?id=e32cc011bbe899fda432906776702f74fa6b1450'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/gremlin.scm'>
<input type='hidden' name='id' value='e32cc011bbe899fda432906776702f74fa6b1450'/><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=e32cc011bbe899fda432906776702f74fa6b1450'>root</a>/<a href='/guix/log/tests?id=e32cc011bbe899fda432906776702f74fa6b1450'>tests</a>/<a href='/guix/log/tests/gremlin.scm?id=e32cc011bbe899fda432906776702f74fa6b1450'>gremlin.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/tests/gremlin.scm?id=e32cc011bbe899fda432906776702f74fa6b1450&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-01-16 20:21:27 -0800'>2022-01-16</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=24c3485bb3ffc05e687ef6513ac287b8d3048bab'>tests: Fix file-needed/recursive on aarch64-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/52943&gt;.

* tests/gremlin.scm (file-needed/recursive)[ground-truth]: On aarch64-linux,
remove the dynamic linker from this list.
</span></span></td><td>Pierre Langlois</td></tr>
<tr><td><span title='2022-01-14 22:39:24 +0100'>2022-01-14</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=e7ad192de008a6a21638def6eb973b9cc0c91116'>gremlin: Adjust tests for i686 and beyond.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;https://issues.guix.gnu.org/52752&gt;.
Reported by Denis 'GNUtoo' Carikli &lt;GNUtoo@cyberdimension.org&gt;.

* tests/gremlin.scm ("file-needed/recursive"): Augment the list of vDSO
names.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-01-08 15:51:22 -0800'>2022-01-08</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=6a2050b1e1c7f09ef9b6af43044b7c0e4786d39d'>tests: Fix file-needed/recursive on powerpc64le-linux.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/52940&gt;.

* tests/gremlin.scm (file-needed/recursive): Consider two entries to be
equivalent not when they are the same string, but rather when they refer to
the same file.
[ground-truth]: In addition to strings that begin with "linux-vdso.so", remove
strings that begin with "linux-vdso64.so".
</span></span></td><td>Chris Marusich</td></tr>
<tr><td><span title='2021-06-23 20:30:22 -0700'>2021-06-23</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=e4b5a23841bc6a92e2e21dd8b1038addee55eb02'>tests: gremlin: Skip file-needed/recursive if DT_NEEDED is empty.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/gremlin.scm (file-needed/recursive): Skip the test when (file-runpath
%guile-executable) evaluates to the empty list.  This causes the test to be
correctly skipped in the case where Guix has been built using a foreign
distro's toolchain and libraries.
</span></span></td><td>Chris Marusich</td></tr>
<tr><td><span title='2021-04-22 14:04:27 +0200'>2021-04-22</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=1010171280cb34c8dc361644b66fdd1a041d297a'>gremlin: 'elf-dynamic-info' returns a file name rathern than a dynamic entry.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build/gremlin.scm (elf-dynamic-info): Return the dynamic entry
value, not the dynamic entry.
* tests/gremlin.scm ("elf-dynamic-info-soname"): New test.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Dion Mendel</td></tr>
<tr><td><span title='2020-12-01 21:30:28 +0100'>2020-12-01</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=53fd256e5ba43e516fb9d6eaf085b88fe8bd12b6'>gremlin: Add 'file-needed/recursive'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build/gremlin.scm (file-needed/recursive): New procedure.
* tests/gremlin.scm ("file-needed/recursive"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-19 17:28:46 +0200'>2020-09-19</span></td><td><a href='/guix/commit/tests/gremlin.scm?id=49a1203d67a90a6a7ce4e4537697a6da96ceb213'>gremlin: Add 'set-file-runpath', 'file-runpath', and 'file-needed'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/build/gremlin.scm (file-dynamic-info, file-runpath, file-needed):
New procedures.
(&amp;missing-runpath-error, &amp;runpath-too-long-error): New condition types.
(set-file-runpath): New procedure.
* tests/gremlin.scm ("set-file-runpath + file-runpath"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>