| commit | 8795962bafc636768ede497a2da4a0a584664816 | [log] [tgz] |
|---|---|---|
| author | borenet <borenet@chromium.org> | Thu Apr 28 09:31:38 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Apr 28 09:31:38 2016 -0700 |
| tree | 8f70fc06c679ce39197dcd20cc4c0c449cc0ea4e | |
| parent | d77ac7792405814fac3fdf229dea348dede650f1 [diff] |
Stop printing warnings about ADB version BUG=skia:5156 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1927973002 Review-Url: https://codereview.chromium.org/1927973002
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh index 87dcb0f..81e4851 100644 --- a/platform_tools/android/bin/utils/setup_adb.sh +++ b/platform_tools/android/bin/utils/setup_adb.sh
@@ -25,20 +25,3 @@ echo "The adb binary is not executable" exit 1 fi - -if [ $(uname) == "Linux" ]; then - ADB_REQUIRED="1.0.32 or 1.0.35" -elif [ $(uname) == "Darwin" ]; then - ADB_REQUIRED="1.0.31 or 1.0.32" -fi - -# get the version string as an array, use just the version numbers -ADB_VERSION="$($ADB version)" -ADB_VERSION=($ADB_VERSION) -ADB_VERSION=${ADB_VERSION[4]} - -if [[ "$ADB_REQUIRED" != *"$ADB_VERSION"* ]]; then - echo "WARNING: Your ADB version is out of date!" - echo " Expected ADB Version: ${ADB_REQUIRED}" - echo " Actual ADB Version: ${ADB_VERSION}" -fi