diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 22:15:16 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-23 22:15:16 +0000 |
| commit | fd3fb3bf72a2f8ce4ae6ba57bf10e2928d39e1d0 (patch) | |
| tree | 71170f7d87cbe54cbf2f5a9f5c6436a3d581aa7c /build/common.gypi | |
| parent | a1d9a7649441975b6bc1270612e814fbf2bc106d (diff) | |
| download | chromium_src-fd3fb3bf72a2f8ce4ae6ba57bf10e2928d39e1d0.zip chromium_src-fd3fb3bf72a2f8ce4ae6ba57bf10e2928d39e1d0.tar.gz chromium_src-fd3fb3bf72a2f8ce4ae6ba57bf10e2928d39e1d0.tar.bz2 | |
Applying release settings to Release_Base rather than just Release.
This ensures that both 32-bit and 64-bit windows executables get
release settings (like 'defines': ['OFFICIAL_BUILD']).
BUG=http://code.google.com/p/chromium/issues/detail?id=129372
TEST=None
R=bradchen@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10423010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/build/common.gypi b/build/common.gypi index 1f4539d..a0e9ab3 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -1822,6 +1822,9 @@ }, }, 'conditions': [ + ['msvs_use_common_release', { + 'includes': ['release.gypi'], + }], ['release_valgrind_build==0', { 'defines': [ 'NVALGRIND', @@ -1851,11 +1854,6 @@ }, 'Release': { 'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'], - 'conditions': [ - ['msvs_use_common_release', { - 'includes': ['release.gypi'], - }], - ] }, 'conditions': [ [ 'OS=="win"', { |