diff options
| author |  kjlubick <kjlubick@google.com> | 2016-04-07 10:57:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-07 10:57:27 -0700 |
| commit | 312398159cf6c82af07b3b4ec5a4e066dd782a07 (patch) | |
| tree | fd5edcf6bab9de95e92a4e0e6b18b68f2078d8e7 /platform_tools/android/bin | |
| 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
Diffstat (limited to 'platform_tools/android/bin')
| -rw-r--r-- | platform_tools/android/bin/utils/setup_adb.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh index e59b43c335..87dcb0f031 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 |