platform_tools/android/bin/utils/setup_adb.sh - Issue 1869813002: Add support for pyadb to setup_adb.sh

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: platform_tools/android/bin/utils/setup_adb.sh

Issue 1869813002: Add support for pyadb to setup_adb.sh (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: platform_tools/android/bin/utils/setup_adb.sh

diff --git a/platform_tools/android/bin/utils/setup_adb.sh b/platform_tools/android/bin/utils/setup_adb.sh

index e59b43c335bf69268604e32ea90e75b54c2b5c56..87dcb0f03114ecf06016623d3669a2bc9adcf345 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

« no previous file with comments | « no previous file | no next file » | no next file with comments »