Index: tools/android/adb_remote_setup.sh |
diff --git a/tools/android/adb_remote_setup.sh b/tools/android/adb_remote_setup.sh |
index bf209cdb39c6384618a4dfba5ead704cc3735b54..87c6601b53ed37260198894fe54786fd91db7977 100755 |
--- a/tools/android/adb_remote_setup.sh |
+++ b/tools/android/adb_remote_setup.sh |
@@ -61,6 +61,19 @@ if which kinit >/dev/null; then |
kinit -R || kinit |
fi |
+# Ensure local and remote versions of adb are the same. |
+remote_adb_version=$(ssh "$remote_host" "$remote_adb version") |
+local_adb_version=$(adb version) |
+if [[ "$local_adb_version" != "$remote_adb_version" ]]; then |
+ echo >&2 |
+ echo "WARNING: local adb is not the same version as remote adb." >&2 |
+ echo "This should be fixed since it may result in protocol errors." >&2 |
+ echo " local adb: $local_adb_version" >&2 |
+ echo " remote adb: $remote_adb_version" >&2 |
+ echo >&2 |
+ sleep 5 |
+fi |
+ |
# Kill the adb server on the remote host. |
ssh "$remote_host" "$remote_adb kill-server" |