summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-14 18:39:27 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-14 18:39:27 +0000
commit9e4c520da70a35cb45396ec8cb4bb53c4d334a5f (patch)
tree97bd9d831ee21b7351796a43afbcce629de48eed /build
parent7335c127fa9ffca84d4229fc41dcb1e76fa265eb (diff)
downloadchromium_src-9e4c520da70a35cb45396ec8cb4bb53c4d334a5f.zip
chromium_src-9e4c520da70a35cb45396ec8cb4bb53c4d334a5f.tar.gz
chromium_src-9e4c520da70a35cb45396ec8cb4bb53c4d334a5f.tar.bz2
Allow overriding GYP_GENERATORS in chromium.gyp_env.
This is useful e.g. if you use Ninja. BUG=None Review URL: https://chromiumcodereview.appspot.com/10356138 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/gyp_chromium5
1 files changed, 3 insertions, 2 deletions
diff --git a/build/gyp_chromium b/build/gyp_chromium
index 226ba1a..d9dd884 100755
--- a/build/gyp_chromium
+++ b/build/gyp_chromium
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -59,7 +59,8 @@ def apply_gyp_environment(file_path=None):
'CHROMIUM_GYP_SYNTAX_CHECK',
'GYP_DEFINES',
'GYP_GENERATOR_FLAGS',
- 'GYP_GENERATOR_OUTPUT', )
+ 'GYP_GENERATOR_OUTPUT',
+ 'GYP_GENERATORS', )
for var in supported_vars:
val = file_data.get(var)
if val: