platform_tools/android/bin/android_setup.sh - Issue 250303002: android scripts respect SKIA_OUT, if already set.

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 250303002: android scripts respect SKIA_OUT, if already set. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 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/android_setup.sh

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

index 9018de1acfb97ade6a8ee78e2dd2889d65ebf287..6438b44aed91653a50466e2651db8431eea05556 100755

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

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

@@ -148,7 +148,7 @@ setup_device() {

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

exportVar GYP_DEFINES "$DEFINES $GYP_DEFINES"

- exportVar SKIA_OUT "out/config/android-${TARGET_DEVICE}"

+ exportVar SKIA_OUT "${SKIA_OUT:-out/config/android-${TARGET_DEVICE}}"

}

# adb_pull_if_needed(android_src, host_dst)

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