diff options
| author |  kkinnunen <kkinnunen@nvidia.com> | 2016-01-13 22:53:55 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-01-13 22:53:55 -0800 |
| commit | 7ddfeeddf78b78de28874432eb9a95735b56af7b (patch) | |
| tree | 6f17726587650223d4c9cd99a66fd587629641af /platform_tools | |
| parent | 3a24f459582f2665f0e66bd35a0d8f46a1c4c72f (diff) | |
Make android scripts not warn about ADB in newer SDKs
The older SDK says:
$ adb version
Android Debug Bridge version 1.0.32
The newer SDK says:
$ adb version
Android Debug Bridge version 1.0.32
Revision eac51f2bb6a8-android
Removes the shebang as the file is not intended to be
run, and the copyright would render it useless.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1583793002
Review URL: https://codereview.chromium.org/1583793002
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/bin/utils/setup_adb.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh index cb3311aa64..767027b8cf 100644 --- a/platform_tools/android/bin/utils/setup_adb.sh +++ b/platform_tools/android/bin/utils/setup_adb.sh @@ -1,5 +1,7 @@ -#!/bin/bash +# Copyright 2015 Google Inc. # +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. UTIL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -24,9 +26,10 @@ elif [ $(uname) == "Darwin" ]; then ADB_REQUIRED="1.0.31 or 1.0.32" fi -# get the version and then truncate it to be just the version numbers +# get the version string as an array, use just the version numbers ADB_VERSION="$($ADB version)" -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!" |