platform_tools/android/bin/android_setup.sh - Issue 1832883002: Skip toolchain downloads for a few android tools

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/android_setup.sh

Issue 1832883002: Skip toolchain downloads for a few android tools (Closed) Base URL: https://skia.googlesource.com/skia@master

Patch Set: Address comment Created 4 years, 9 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/android_setup.sh

diff --git a/platform_tools/android/bin/android_setup.sh b/platform_tools/android/bin/android_setup.sh

index 4b7a60f84a4d13055974f8d6035aa9a333efaef1..fd05a985e31a996e6312a49836835aa56a24bbfb 100755

--- a/platform_tools/android/bin/android_setup.sh

+++ b/platform_tools/android/bin/android_setup.sh

@@ -162,8 +162,10 @@ setup_device() {

verbose "The build is targeting the device: $TARGET_DEVICE"

exportVar DEVICE_ID $TARGET_DEVICE

- # setup the appropriate cross compiling toolchains

- source $SCRIPT_DIR/utils/setup_toolchain.sh

+ if [ -z "$SKIP_TOOLCHAIN_SETUP" ]; then

+ # setup the appropriate cross compiling toolchains

+ source $SCRIPT_DIR/utils/setup_toolchain.sh

+ fi

DEFINES="${DEFINES} android_toolchain=${TOOLCHAIN_TYPE}"

DEFINES="${DEFINES} android_buildtype=${BUILDTYPE}"

« no previous file with comments | « platform_tools/android/bin/android_run_skia ('k') | no next file » | no next file with comments »