build/android/envsetup_functions.sh - Issue 10834296: Second attempt at fixing Ninja build for Android and change make for host os optionally use goma

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 10834296: Second attempt at fixing Ninja build for Android and change make for host os optionally use goma (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 4 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:

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 128d78fcf3078a20508e539d1983fe0bbe1b993b..2dd077ae638f377eb98f1215f79542d1be05c339 100755

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

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

@@ -122,7 +122,9 @@ common_vars_defines() {

################################################################################

common_gyp_vars() {

export GYP_DEFINES="${DEFINES}"

- export GYP_GENERATORS="make-android"

+ if [[ -z "${GYP_GENERATORS}" ]]; then

+ export GYP_GENERATORS="make-android"

+ fi

# Use our All target as the default

export GYP_GENERATOR_FLAGS="${GYP_GENERATOR_FLAGS} default_target=All"

« build/android/envsetup.sh ('K') | « build/android/envsetup.sh ('k') | no next file » | no next file with comments »