chrome/chrome_common.gypi - Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode

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: chrome/chrome_common.gypi

Issue 142223002: Support -Goutput_dir=blahblah in GN-GYP hybrid mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: prefer command line over env if both are specified Created 6 years, 11 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: chrome/chrome_common.gypi

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi

index f915ee171066aeb673b44b10b9f443e3d059d254..80a4bdd8000828bd3c16d6394562bd01fddda4b5 100644

--- a/chrome/chrome_common.gypi

+++ b/chrome/chrome_common.gypi

@@ -414,6 +414,7 @@

}],

['OS != "ios"', {

'dependencies': [

+ '<(DEPTH)/<(gyp_output_dir)/gn_gyp/third_party/re2/re2.gyp:re2',

'<(DEPTH)/chrome/common/extensions/api/api.gyp:api',

'<(DEPTH)/components/components.gyp:autofill_core_common',

'<(DEPTH)/components/components.gyp:autofill_content_common',

@@ -422,7 +423,6 @@

'<(DEPTH)/extensions/extensions.gyp:extensions_common',

'<(DEPTH)/ipc/ipc.gyp:ipc',

'<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h',

- '<(DEPTH)/out/gn_gyp/third_party/re2/re2.gyp:re2',

'<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

}, { # OS == ios

« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »