--- 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=8ac0b82e35509aad84e92d6064809ae342d03cc4'>refs</a><a class='active' href='/guix/log/nix/nix-daemon/nix-daemon.cc'>log</a><a href='/guix/tree/nix/nix-daemon/nix-daemon.cc?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>tree</a><a href='/guix/commit/nix/nix-daemon/nix-daemon.cc?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>commit</a><a href='/guix/diff/nix/nix-daemon/nix-daemon.cc?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/nix-daemon/nix-daemon.cc'>
<input type='hidden' name='id' value='8ac0b82e35509aad84e92d6064809ae342d03cc4'/><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=8ac0b82e35509aad84e92d6064809ae342d03cc4'>root</a>/<a href='/guix/log/nix?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>nix</a>/<a href='/guix/log/nix/nix-daemon?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>nix-daemon</a>/<a href='/guix/log/nix/nix-daemon/nix-daemon.cc?id=8ac0b82e35509aad84e92d6064809ae342d03cc4'>nix-daemon.cc</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/nix/nix-daemon/nix-daemon.cc?id=8ac0b82e35509aad84e92d6064809ae342d03cc4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-11 23:18:53 +0100'>2023-12-11</span></td><td><a href='/guix/commit/nix/nix-daemon/nix-daemon.cc?id=1e47148f46e31eb99ce8ec7bc12232cf50d0ebec'>daemon: Implement ‘substitute-urls’ RPC.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/worker-protocol.hh (PROTOCOL_VERSION): Bump.
(WorkerOp): Add ‘wopSubstituteURLs’.
* nix/nix-daemon/nix-daemon.cc (performOp): Implement it.
* guix/store.scm (%protocol-version): Bump.
(operation-id): Add ‘substitute-urls’.
(substitute-urls): New procedure.
* tests/store.scm ("substitute-urls, default")
("substitute-urls, client-specified URLs")
("substitute-urls, disabled"): New tests.

Change-Id: I2c0119500c3a1eecfa5ebf32463ffb0f173161de
</span></span></td><td>Ludovic Courtès</td></tr>