Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(825)

Unified Diff: build/common.gypi

Issue 174483: Moving configuration platform to always be present, as that is required... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 24385)
+++ build/common.gypi (working copy)
@@ -274,10 +274,10 @@
},
'conditions': [
[ 'OS=="win" and msvs_use_common_release', {
- 'configuration_platform': 'Win32',
'msvs_props': ['release.vsprops'],
}],
[ 'OS=="win"', {
+ 'configuration_platform': 'Win32',
'msvs_configuration_attributes': {
'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
@@ -295,6 +295,7 @@
[ 'OS=="win"', {
# TODO(bradnelson): add a gyp mechanism to make this more graceful.
'Purify': {
+ 'configuration_platform': 'Win32',
'defines': [
'NDEBUG',
'PURIFY',
@@ -318,12 +319,12 @@
},
'conditions': [
[ 'msvs_use_common_release', {
- 'configuration_platform': 'Win32',
'msvs_props': ['release.vsprops'],
}],
],
},
'Release - no tcmalloc': {
+ 'configuration_platform': 'Win32',
'defines': [
'NDEBUG',
'NO_TCMALLOC',
@@ -335,7 +336,6 @@
},
'conditions': [
[ 'msvs_use_common_release', {
- 'configuration_platform': 'Win32',
'msvs_props': ['release.vsprops'],
}],
],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698