AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow either the old or new version of ADB on mac.

Browse Source 
Review URL: https://codereview.chromium.org/926003002
This commit is contained in:
djsollen 2015-02-19 18:39:40 -08:00 committed by Commit bot
parent b602d4dff8
commit 176cd92a61
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform_tools/android/bin/utils/setup_adb.sh
View File

@ -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}"