diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 20:44:47 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-10 20:44:47 +0000 |
| commit | 615a3de168aa22c73cd25fc44a919d708cf2d9c6 (patch) | |
| tree | f768614981cacfa4b4d659c5989bf84f44cba9da /build/gyp_chromium | |
| parent | a8eaeca0c01a78730a83eca87b06fb6114a4d929 (diff) | |
| download | chromium_src-615a3de168aa22c73cd25fc44a919d708cf2d9c6.zip chromium_src-615a3de168aa22c73cd25fc44a919d708cf2d9c6.tar.gz chromium_src-615a3de168aa22c73cd25fc44a919d708cf2d9c6.tar.bz2 | |
Remove features_override.gypi. Currently, it matches the values
in the upstream features.gypi.
Review URL: http://codereview.chromium.org/7104114
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/gyp_chromium')
| -rwxr-xr-x | build/gyp_chromium | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium index 18e7d65..4b30f76 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')) |