diff options
| author |  djsollen <djsollen@google.com> | 2015-02-19 18:39:40 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-19 18:39:40 -0800 |
| commit | 176cd92a61a35432d8cba10d61c3e579654835df (patch) | |
| tree | 0baf2908191742c9834f646efe02b95799e4a940 /platform_tools | |
| parent | b602d4dff8a353f686ce6d7f9d01b7882cc10277 (diff) | |
Allow either the old or new version of ADB on mac.
Review URL: https://codereview.chromium.org/926003002
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/bin/utils/setup_adb.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh index e372dd2913..cb3311aa64 100644 --- a/platform_tools/android/bin/utils/setup_adb.sh +++ b/platform_tools/android/bin/utils/setup_adb.sh @@ -21,14 +21,14 @@ fi if [ $(uname) == "Linux" ]; then ADB_REQUIRED="1.0.32" elif [ $(uname) == "Darwin" ]; then - ADB_REQUIRED="1.0.31" + ADB_REQUIRED="1.0.31 or 1.0.32" fi # get the version and then truncate it to be just the version numbers ADB_VERSION="$($ADB version)" ADB_VERSION="${ADB_VERSION##* }" -if [ $ADB_VERSION != $ADB_REQUIRED ]; then +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}" |