diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:06:44 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 18:06:44 +0000 |
| commit | ef3326709df5da0b95ffec975e58c8c9e9245415 (patch) | |
| tree | 304d68cb95dd8da60c16dfb4059dece92c09e4fe /build | |
| parent | 5ad32257291aeb70e31e3194613a7d50880cbf92 (diff) | |
| download | chromium_src-ef3326709df5da0b95ffec975e58c8c9e9245415.zip chromium_src-ef3326709df5da0b95ffec975e58c8c9e9245415.tar.gz chromium_src-ef3326709df5da0b95ffec975e58c8c9e9245415.tar.bz2 | |
Move build_dir_prefix up a level of nesting so we don't create
a 'variables' configuration in xcode.
BUG=99226
Review URL: http://codereview.chromium.org/8164001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 2cd76ba..a4cda52 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -885,6 +885,11 @@ 'debug_extra_cflags%': '', 'release_valgrind_build%': 0, + # Only used by Windows build for now. Can be used to build into a + # differet output directory, e.g., a build_dir_prefix of VS2010_ would + # output files in src/build/VS2010_{Debug,Release}. + 'build_dir_prefix%': '', + 'conditions': [ ['OS=="win" and component=="shared_library"', { # See http://msdn.microsoft.com/en-us/library/aa652367.aspx @@ -1235,12 +1240,6 @@ ], # target_conditions for 'target_defaults' 'default_configuration': 'Debug', 'configurations': { - 'variables' : { - # Only used by Windows build for now. Can be used to build into a - # differet output directory, e.g., a build_dir_prefix of VS2010_ would - # output files in src/build/VS2010_{Debug,Release}. - 'build_dir_prefix%': '', - }, # VCLinkerTool LinkIncremental values below: # 0 == default # 1 == /INCREMENTAL:NO |