build/android/envsetup_functions.sh - Issue 116833006: Skip downloading of nacl toolchain for android. Nacl is not enabled in android and it takes too lon…

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: build/android/envsetup_functions.sh

Issue 116833006: Skip downloading of nacl toolchain for android. Nacl is not enabled in android and it takes too lon… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Skip nacl toolchain for android Created 7 years ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/envsetup_functions.sh

diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh

index bf8abb6f500920395d1f847b5f17767711fd6abb..460b935820f374b875911da3557e3cfacacca084 100755

--- a/build/android/envsetup_functions.sh

+++ b/build/android/envsetup_functions.sh

@@ -132,6 +132,9 @@ ${ANDROID_SDK_BUILD_TOOLS_VERSION}

print_usage

return 1

esac

+ # nacl isn't enabled for android, avoid downloading the toolchain.

+ DEFINES+=" -Ddisable_nacl=1"

}

@@ -255,7 +258,7 @@ sdk_build_init() {

common_vars_defines

DEFINES+="${sdk_defines}"

atreat 2013/12/20 19:55:00 Unnecessary whitespace change.

navabi 2013/12/20 20:37:00 nit: remove this space

common_gyp_vars

if [[ -n "$CHROME_ANDROID_BUILD_WEBVIEW" ]]; then

« no previous file with comments | « no previous file | build/download_nacl_toolchains.py » ('j') | build/download_nacl_toolchains.py » ('J')