--- 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"
><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=fe0f8c627a3264b06655484beef587e769a5a027'>refs</a><a class='active' href='/guix/log/scripts'>log</a><a href='/guix/tree/scripts?id=fe0f8c627a3264b06655484beef587e769a5a027'>tree</a><a href='/guix/commit/scripts?id=fe0f8c627a3264b06655484beef587e769a5a027'>commit</a><a href='/guix/diff/scripts?id=fe0f8c627a3264b06655484beef587e769a5a027'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/scripts'>
<input type='hidden' name='id' value='fe0f8c627a3264b06655484beef587e769a5a027'/><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=fe0f8c627a3264b06655484beef587e769a5a027'>root</a>/<a href='/guix/log/scripts?id=fe0f8c627a3264b06655484beef587e769a5a027'>scripts</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/scripts?id=fe0f8c627a3264b06655484beef587e769a5a027&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-11 19:06:53 +0100'>2020-12-11</span></td><td><a href='/guix/commit/scripts?id=fd247542215fbd10f28980f3d5255014b150e95a'>build: 'script/guix' uses our own 'guile' executable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>