Revert 35012 - Rearrange build configurations make it clearer and allow better support for x64 on Windows

TEST=none
BUG=29467

Review URL: http://codereview.chromium.org/501127

TBR=gregoryd@google.com
Review URL: http://codereview.chromium.org/500149

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35016 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 68 insertions, 108 deletions

diff --git a/app/app_base.gypi b/app/app_base.gypi
index 9c15d4c..f8c86ca 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -282,7 +282,7 @@
             '../third_party/skia/include/core',
           ],
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index fd33645..82876ab 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -20,7 +20,7 @@
       ],
       'direct_dependent_settings': {
         'configurations': {
-          'Common_Base': {
+          'Common': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
@@ -261,7 +261,7 @@
         },
       },
       'configurations': {
-        'Debug_Base': {
+        'Debug': {
           'msvs_settings': {
             'VCCLCompilerTool': {
               'RuntimeLibrary': '0',
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index da69679..ab5b98d 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -14,7 +14,7 @@
           'src',
         ],
         'configurations': {
-          'Debug_Base': {
+          'Debug': {
             'defines': [
               # This is needed for GTMLogger to work correctly.
               'DEBUG',
@@ -115,7 +115,7 @@
             ],
           },
           'configurations': {
-            'Release_Base': {
+            'Release': {
               'xcode_settings': {
                 # dump_syms crashes when built at -O1, -O2, and -O3.  It does
                 # not crash at -Os.  To play it safe, dump_syms is always built
diff --git a/breakpad/breakpad_handler.gypi b/breakpad/breakpad_handler.gypi
index 8c26d42..f97c5e7 100644
--- a/breakpad/breakpad_handler.gypi
+++ b/breakpad/breakpad_handler.gypi
@@ -73,7 +73,7 @@
             ],
           },
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/breakpad/breakpad_sender.gypi b/breakpad/breakpad_sender.gypi
index 679c125..1408dbe 100644
--- a/breakpad/breakpad_sender.gypi
+++ b/breakpad/breakpad_sender.gypi
@@ -59,7 +59,7 @@
             ],
           },
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/build/common.gypi b/build/common.gypi
index bc442fa..b51ce40 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -396,25 +396,18 @@
     ],  # conditions for 'target_defaults'
     'default_configuration': 'Debug',
     'configurations': {
-      # VCLinkerTool LinkIncremental values below:
-      #   0 == default
-      #   1 == /INCREMENTAL:NO
-      #   2 == /INCREMENTAL
-      # Debug links incremental, Release does not.
-      #
-      # Abstract base configurations to cover common
-      # attributes.
-      #
-      'Common_Base': {
+       # VCLinkerTool LinkIncremental values below:
+       #   0 == default
+       #   1 == /INCREMENTAL:NO
+       #   2 == /INCREMENTAL
+       # Debug links incremental, Release does not.
+      'Common': {
         'abstract': 1,
         'msvs_configuration_attributes': {
           'OutputDirectory': '$(SolutionDir)$(ConfigurationName)',
           'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
           'CharacterSet': '1',
         },
-      },
-      'x86_Base': {
-        'abstract': 1,
         'msvs_settings': {
           'VCLinkerTool': {
             'TargetMachine': '1',
@@ -422,36 +415,8 @@
         },
         'msvs_configuration_platform': 'Win32',
       },
-      'x64_Base': {
-        'abstract': 1,
-        'msvs_configuration_platform': 'x64',
-        'msvs_settings': {
-          'VCLinkerTool': {
-            'TargetMachine': '17', # x86 - 64
-          },
-        },
-        'msvs_settings': {
-          'VCLibrarianTool': {
-            'AdditionalLibraryDirectories!':
-              ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
-            'AdditionalLibraryDirectories':
-              ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
-          },
-          'VCLinkerTool': {
-            'TargetMachine': '17',
-            'AdditionalLibraryDirectories!':
-              ['<(DEPTH)/third_party/platformsdk_win7/files/Lib'],
-            'AdditionalLibraryDirectories':
-              ['<(DEPTH)/third_party/platformsdk_win7/files/Lib/x64'],
-          },
-        },
-        'defines': [
-          # Not sure if tcmalloc works on 64-bit Windows.
-          'NO_TCMALLOC',
-        ],
-      },
-      'Debug_Base': {
-        'abstract': 1,
+      'Debug': {
+        'inherit_from': ['Common'],
         'xcode_settings': {
           'COPY_PHASE_STRIP': 'NO',
           'GCC_OPTIMIZATION_LEVEL': '<(mac_debug_optimization)',
@@ -479,8 +444,8 @@
           }],
         ],
       },
-      'Release_Base': {
-        'abstract': 1,
+      'Release': {
+        'inherit_from': ['Common'],
         'defines': [
           'NDEBUG',
         ],
@@ -512,6 +477,9 @@
             #  class 'std::bad_cast'
             'msvs_disabled_warnings': [4275],
           }],
+          ['msvs_use_common_release', {
+            'msvs_props': ['release.vsprops'],
+          }],
           ['OS=="linux"', {
             'cflags': [
              '<@(release_extra_cflags)',
@@ -519,52 +487,44 @@
           }],
         ],
       },
-      'Purify_Base': {
-        'abstract': 1,
-        'defines': [
-          'PURIFY',
-          'NO_TCMALLOC',
-        ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'Optimization': '0',
-            'RuntimeLibrary': '0',
-            'BufferSecurityCheck': 'false',
-          },
-          'VCLinkerTool': {
-            'EnableCOMDATFolding': '1',
-            'LinkIncremental': '1',
-          },
-        },
-      },
-      #
-      # Concrete configurations
-      #
-      'Debug': {
-        'inherit_from': ['Common_Base', 'x86_Base', 'Debug_Base'],
-      },
-      'Release': {
-        'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base'],
-        'conditions': [
-          ['msvs_use_common_release', {
-            'msvs_props': ['release.vsprops'],
-          }],
-        ]
-      },
       'conditions': [
         [ 'OS=="win"', {
           # TODO(bradnelson): add a gyp mechanism to make this more graceful.
           'Purify': {
-            'inherit_from': ['Common_Base', 'x86_Base', 'Release_Base', 'Purify'],
+            'inherit_from': ['Release'],
+            'defines': [
+              'PURIFY',
+              'NO_TCMALLOC',
+            ],
+            'msvs_settings': {
+              'VCCLCompilerTool': {
+                'Optimization': '0',
+                'RuntimeLibrary': '0',
+                'BufferSecurityCheck': 'false',
+              },
+              'VCLinkerTool': {
+                'EnableCOMDATFolding': '1',
+                'LinkIncremental': '1',
+              },
+            },
+          },
+          'Common_x64': {
+            'msvs_configuration_platform': 'x64',
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'TargetMachine': '17',
+              },
+            },
+            'abstract': 1,
           },
           'Debug_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Debug_Base'],
+            'inherit_from': ['Debug', 'Common_x64'],
           },
           'Release_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base'],
+            'inherit_from': ['Release', 'Common_x64'],
           },
           'Purify_x64': {
-            'inherit_from': ['Common_Base', 'x64_Base', 'Release_Base', 'Purify'],
+            'inherit_from': ['Purify', 'Common_x64'],
           },
         }],
       ],
@@ -668,7 +628,7 @@
           'OFFICIAL_BUILD',
         ],
         'configurations': {
-          'Debug_Base': {
+          'Debug': {
             'variables': {
               'debug_optimize%': '0',
             },
@@ -901,7 +861,7 @@
                 # strip_from_xcode will not be used, set Xcode to do the
                 # stripping as well.
                 'configurations': {
-                  'Release_Base': {
+                  'Release': {
                     'xcode_settings': {
                       'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym',
                       'DEPLOYMENT_POSTPROCESSING': 'YES',
@@ -1091,7 +1051,7 @@
           },
         },
         'configurations': {
-          'x86_Base': {
+          'Common': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':
@@ -1099,7 +1059,7 @@
               },
             },
           },
-          'x64_Base': {
+          'Common_x64': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalOptions':
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 6e7639b..da30ab1 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1764,7 +1764,7 @@
                 },
               },
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -2622,7 +2622,7 @@
                 }],
               ],
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bf682a5..aad10e6 100755
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -373,7 +373,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -456,7 +456,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -998,7 +998,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1133,7 +1133,7 @@
             '<(allocator_target)',
           ],
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1483,7 +1483,7 @@
             ],
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1553,7 +1553,7 @@
             }],
             ['OS=="win"', {
               'configurations': {
-                'Debug_Base': {
+                'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
@@ -1664,7 +1664,7 @@
                   '<(allocator_target)',
                 ],
                 'configurations': {
-                  'Debug_Base': {
+                  'Debug': {
                     'msvs_settings': {
                       'VCLinkerTool': {
                         'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
diff --git a/chrome/installer/installer_util.gypi b/chrome/installer/installer_util.gypi
index eeee198..df69383 100644
--- a/chrome/installer/installer_util.gypi
+++ b/chrome/installer/installer_util.gypi
@@ -112,7 +112,7 @@
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp
index 1314599..698884d 100755
--- a/chrome/installer/mini_installer.gyp
+++ b/chrome/installer/mini_installer.gyp
@@ -60,7 +60,7 @@
             },
           },
           'configurations': {
-            'Debug_Base': {
+            'Debug': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'BasicRuntimeChecks': '0',
diff --git a/chrome/test/interactive_ui/interactive_ui_tests.gypi b/chrome/test/interactive_ui/interactive_ui_tests.gypi
index efa6be0..983dc27 100644
--- a/chrome/test/interactive_ui/interactive_ui_tests.gypi
+++ b/chrome/test/interactive_ui/interactive_ui_tests.gypi
@@ -135,7 +135,7 @@
         }],
       ],
       'configurations': {
-        'Debug_Base': {
+        'Debug': {
           'msvs_settings': {
             'VCLinkerTool': {
               'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 34d3600..7044648 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -583,7 +583,7 @@
       },
       'configurations': {
         # Bring back the standard library in debug buidls.
-        'Debug_Base': {
+        'Debug': {
           'msvs_settings': {
             'VCLinkerTool': {
               'IgnoreAllDefaultLibraries': "false",
diff --git a/ipc/ipc.gypi b/ipc/ipc.gypi
index fb14f1f..2623765 100644
--- a/ipc/ipc.gypi
+++ b/ipc/ipc.gypi
@@ -82,7 +82,7 @@
             ],
           },
           'configurations': {
-            'Common_Base': {
+            'Common': {
               'msvs_target_platform': 'x64',
             },
           },
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index e0166e8..2c673f1 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -19,7 +19,7 @@
       ],
       'direct_dependent_settings': {
         'configurations': {
-          'Common_Base': {
+          'Common': {
             'msvs_settings': {
               'VCLinkerTool': {
                 'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
@@ -150,7 +150,7 @@
         },
       },
       'configurations': {
-        'Debug_Base': {
+        'Debug': {
           'msvs_settings': {
             'VCCLCompilerTool': {
               'RuntimeLibrary': '0',