summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS4
-rwxr-xr-xbuild/gyp_chromium3
2 files changed, 3 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index f8a4537..ccae218 100644
--- a/DEPS
+++ b/DEPS
@@ -187,9 +187,7 @@ hooks = [
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
- "action": ["python",
- "src/build/gyp_chromium",
- "-Isrc/build/features_override.gypi"],
+ "action": ["python", "src/build/gyp_chromium"],
},
{
# Workaround IncrediBuild problem. http://crbug.com/17706.
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'))