summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authoryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 23:08:42 +0000
committeryaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-01 23:08:42 +0000
commit21415977868b59b883370ceaba6dcbc7e4fe08c7 (patch)
treefedf9b2aaf75a581786f93f1faec7d32a94112f6 /DEPS
parentc706ac3791b4a8908ad53e27308cdef798f0f6ff (diff)
downloadchromium_src-21415977868b59b883370ceaba6dcbc7e4fe08c7.zip
chromium_src-21415977868b59b883370ceaba6dcbc7e4fe08c7.tar.gz
chromium_src-21415977868b59b883370ceaba6dcbc7e4fe08c7.tar.bz2
Override mechanism for features.gypi
This will allow us to have a different set of feature_defines for upstream and downstream webkit builds. Review URL: http://codereview.chromium.org/242102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS8
1 files changed, 6 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 91c1735..88fa375 100644
--- a/DEPS
+++ b/DEPS
@@ -187,11 +187,15 @@ hooks = [
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
- "action": ["python", "src/build/gyp_chromium"],
+ "action": ["python",
+ "src/build/gyp_chromium",
+ "-Isrc/build/features_override.gypi"],
},
{
# Workaround IncrediBuild problem. http://crbug.com/17706.
"pattern": "\\.grd$",
- "action": ["python", "src/build/win/clobber_generated_headers.py", "$matching_files"],
+ "action": ["python",
+ "src/build/win/clobber_generated_headers.py",
+ "$matching_files"],
},
]