--- 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"
d 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=479deffa02a2dfdf93722f1044f67fddde92b004'>refs</a><a class='active' href='/guix/log/doc/images/service-graph.dot'>log</a><a href='/guix/tree/doc/images/service-graph.dot?id=479deffa02a2dfdf93722f1044f67fddde92b004'>tree</a><a href='/guix/commit/doc/images/service-graph.dot?id=479deffa02a2dfdf93722f1044f67fddde92b004'>commit</a><a href='/guix/diff/doc/images/service-graph.dot?id=479deffa02a2dfdf93722f1044f67fddde92b004'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/images/service-graph.dot'>
<input type='hidden' name='id' value='479deffa02a2dfdf93722f1044f67fddde92b004'/><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=479deffa02a2dfdf93722f1044f67fddde92b004'>root</a>/<a href='/guix/log/doc?id=479deffa02a2dfdf93722f1044f67fddde92b004'>doc</a>/<a href='/guix/log/doc/images?id=479deffa02a2dfdf93722f1044f67fddde92b004'>images</a>/<a href='/guix/log/doc/images/service-graph.dot?id=479deffa02a2dfdf93722f1044f67fddde92b004'>service-graph.dot</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/doc/images/service-graph.dot?id=479deffa02a2dfdf93722f1044f67fddde92b004&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-04-14 10:29:07 +0200'>2024-04-14</span></td><td><a href='/guix/commit/doc/images/service-graph.dot?id=076670f7acb740e2bfbd8e3c8ef1be5221ed75c5'>doc: Use "dejavu sans" instead of "Helvetica" or "sans" in dot images.</a><span class='msg-avail'>...<span class='msg-tooltip'>Font-dejavu is (now) an input of fontconfig.  Specifying "dejavu sans" makes
generated images reproducible even when other fonts are installed (notably
font-google-noto).

* doc/images/bootstrap-graph.dot,
doc/images/bootstrap-packages.dot,
doc/images/coreutils-bag-graph.dot,
doc/images/coreutils-graph.dot,
doc/images/gcc-core-mesboot0-graph.dot,
doc/images/service-graph.dot,
doc/images/shepherd-graph.dot: Use fontname = "dejavu sans".
* doc/guix.texi (Full-Source Bootstrap): Update gcc-core-mesboot0.dot recipe
accordingly.

Change-Id: If21d7d39d45c66de5bceafb7b825a057d540ee50
</span></span></td><td>Janneke Nieuwenhuizen</td></tr>