| commit | 312398159cf6c82af07b3b4ec5a4e066dd782a07 | [log] [tgz] |
|---|---|---|
| author | kjlubick <kjlubick@google.com> | Thu Apr 07 10:57:27 2016 -0700 |
| committer | Commit bot <commit-bot@chromium.org> | Thu Apr 07 10:57:27 2016 -0700 |
| tree | fd5edcf6bab9de95e92a4e0e6b18b68f2078d8e7 | |
| parent | 8af936d3047208def585b7bc824f013b994f6312 [diff] |
Add support for pyadb to setup_adb.sh BUG=skia:5156 GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1869813002 Review URL: https://codereview.chromium.org/1869813002
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh index e59b43c..87dcb0f 100644 --- a/platform_tools/android/bin/utils/setup_adb.sh +++ b/platform_tools/android/bin/utils/setup_adb.sh
@@ -5,6 +5,12 @@ UTIL_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +if [ $PYADB ] && [ -a "$PYADB" ]; then + echo "Python ADB detected, going to use that" + ADB="python ${PYADB}" + return +fi + if [ "$(which adb)" != "" ]; then ADB="$(which adb)" elif [ -d "$ANDROID_SDK_ROOT" ]; then