| OLD | NEW |
| 1 # Copyright 2015 Google Inc. | 1 # Copyright 2015 Google Inc. |
| 2 # | 2 # |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 UTIL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | 6 UTIL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" |
| 7 | 7 |
| 8 if [ "$(which adb)" != "" ]; then | 8 if [ "$(which adb)" != "" ]; then |
| 9 ADB="$(which adb)" | 9 ADB="$(which adb)" |
| 10 elif [ -d "$ANDROID_SDK_ROOT" ]; then | 10 elif [ -d "$ANDROID_SDK_ROOT" ]; then |
| 11 ADB="${ANDROID_SDK_ROOT}/platform-tools/adb" | 11 ADB="${ANDROID_SDK_ROOT}/platform-tools/adb" |
| 12 else | 12 else |
| 13 echo $ANDROID_SDK_ROOT | 13 echo $ANDROID_SDK_ROOT |
| 14 echo "No ANDROID_SDK_ROOT set (check that android_setup.sh was properly source
d)" | 14 echo "No ANDROID_SDK_ROOT set (check that android_setup.sh was properly source
d)" |
| 15 exit 1 | 15 exit 1 |
| 16 fi | 16 fi |
| 17 | 17 |
| 18 if [ ! -x $ADB ]; then | 18 if [ ! -x $ADB ]; then |
| 19 echo "The adb binary is not executable" | 19 echo "The adb binary is not executable" |
| 20 exit 1 | 20 exit 1 |
| 21 fi | 21 fi |
| 22 | 22 |
| 23 if [ $(uname) == "Linux" ]; then | 23 if [ $(uname) == "Linux" ]; then |
| 24 ADB_REQUIRED="1.0.32" | 24 ADB_REQUIRED="1.0.32 or 1.0.35" |
| 25 elif [ $(uname) == "Darwin" ]; then | 25 elif [ $(uname) == "Darwin" ]; then |
| 26 ADB_REQUIRED="1.0.31 or 1.0.32" | 26 ADB_REQUIRED="1.0.31 or 1.0.32" |
| 27 fi | 27 fi |
| 28 | 28 |
| 29 # get the version string as an array, use just the version numbers | 29 # get the version string as an array, use just the version numbers |
| 30 ADB_VERSION="$($ADB version)" | 30 ADB_VERSION="$($ADB version)" |
| 31 ADB_VERSION=($ADB_VERSION) | 31 ADB_VERSION=($ADB_VERSION) |
| 32 ADB_VERSION=${ADB_VERSION[4]} | 32 ADB_VERSION=${ADB_VERSION[4]} |
| 33 | 33 |
| 34 if [[ "$ADB_REQUIRED" != *"$ADB_VERSION"* ]]; then | 34 if [[ "$ADB_REQUIRED" != *"$ADB_VERSION"* ]]; then |
| 35 echo "WARNING: Your ADB version is out of date!" | 35 echo "WARNING: Your ADB version is out of date!" |
| 36 echo " Expected ADB Version: ${ADB_REQUIRED}" | 36 echo " Expected ADB Version: ${ADB_REQUIRED}" |
| 37 echo " Actual ADB Version: ${ADB_VERSION}" | 37 echo " Actual ADB Version: ${ADB_VERSION}" |
| 38 fi | 38 fi |
| OLD | NEW |