build/common.gypi - Issue 10511019: Fix gyp on Android called by gclient or makefile regen

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/common.gypi

Issue 10511019: Fix gyp on Android called by gclient or makefile regen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed a typo Created 8 years, 6 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: build/common.gypi

diff --git a/build/common.gypi b/build/common.gypi

index bc9cee2f659f36f3e18849b99310f9763b5e1e21..70f71cc4ce2863ce539e2d93ee1ae2b4e16ca2ff 100644

--- a/build/common.gypi

+++ b/build/common.gypi

@@ -3084,9 +3084,9 @@

# Hardcode the compiler names in the Makefile so that

# it won't depend on the environment at make time.

'make_global_settings': [

- ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],

- ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-g++)'],

- ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${ANDROID_TOOLCHAIN}/*-gcc)'],

+ ['CC', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CC_target}'],

+ ['CXX', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${CXX_target}'],

+ ['LINK', '<!(/bin/echo -n ${ANDROID_GOMA_WRAPPER} ${LINK_target}'],

['CC.host', '<!(which gcc)'],

['CXX.host', '<!(which g++)'],

['LINK.host', '<!(which g++)'],

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