Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Unified Diff: tools/android/adb_remote_setup.sh

Issue 395393002: Add adb version check to adb_remote_setup.sh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: made warning more prominent Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698