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
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh
index cb3311a..767027b 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 @@
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!"