summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 20:48:38 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-05 20:48:38 +0000
commit5bf090edbdee97bd8ce1e87265e3b40736eea906 (patch)
tree2dc43f50aea279f26bcdb099860f14901f133c01 /build
parente38b99cccb3a412b898931b174857f9c6d522048 (diff)
downloadchromium_src-5bf090edbdee97bd8ce1e87265e3b40736eea906.zip
chromium_src-5bf090edbdee97bd8ce1e87265e3b40736eea906.tar.gz
chromium_src-5bf090edbdee97bd8ce1e87265e3b40736eea906.tar.bz2
gyp_chromium automatically includes features_override.gypi
Other projects that use gyp_chromium directly depend on that. Review URL: http://codereview.chromium.org/255078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28035 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/gyp_chromium3
1 files changed, 2 insertions, 1 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index ff7ba1b..c212e8c 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -37,8 +37,9 @@ def additional_include_files(args=[]):
if os.path.realpath(path) not in specified_includes:
result.append(path)
- # Always include common.gypi
+ # Always include common.gypi & features_override.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'))