build/gyp_chromium - Issue 7104114: Remove features_override.gypi. Currently, it matches the values

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/gyp_chromium

Issue 7104114: Remove features_override.gypi. Currently, it matches the values (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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/gyp_chromium

diff --git a/build/gyp_chromium b/build/gyp_chromium

index 18e7d65b0bad9ed2cdc59d4c5de9cdbf4b383fff..4b30f76669c0875d6ee233b5fd33efd738675f2c 100755

--- a/build/gyp_chromium

+++ b/build/gyp_chromium

@@ -88,9 +88,8 @@ def additional_include_files(args=[]):

if os.path.realpath(path) not in specified_includes:

result.append(path)

- # Always include common.gypi & features_override.gypi

+ # Always include common.gypi.

AddInclude(os.path.join(script_dir, 'common.gypi'))

- AddInclude(os.path.join(script_dir, 'features_override.gypi'))

# Optionally add supplemental .gypi files if present.

supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi'))

« no previous file with comments | « build/features_override.gypi ('k') | no next file » | no next file with comments »