Revert of Remove the 'gyp_config' concept from MB.

tools/mb/mb.py

Index: tools/mb/mb.py
diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 507fba05496e067c9702cf7bd88581993bf6662a..b4f7e770dbbc65154bc3f5095fe7b5151000625c 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -146,7 +146,7 @@
     elif vals['type'] == 'gyp':
       if vals['gyp_crosscompile']:
         self.Print('GYP_CROSSCOMPILE=1')
-      cmd = self.GYPCmd('<path>', vals['gyp_defines'])
+      cmd = self.GYPCmd('<path>', vals['gyp_defines'], vals['gyp_config'])
     else:
       raise MBErr('Unknown meta-build type "%s"' % vals['type'])
 
@@ -285,6 +285,7 @@
     vals = {
       'type': None,
       'gn_args': [],
+      'gyp_config': [],
       'gyp_defines': '',
       'gyp_crosscompile': False,
     }
@@ -310,6 +311,8 @@
           vals['gn_args'] += ' ' + mixin_vals['gn_args']
         else:
           vals['gn_args'] = mixin_vals['gn_args']
+      if 'gyp_config' in mixin_vals:
+        vals['gyp_config'] = mixin_vals['gyp_config']
       if 'gyp_crosscompile' in mixin_vals:
         vals['gyp_crosscompile'] = mixin_vals['gyp_crosscompile']
       if 'gyp_defines' in mixin_vals:
@@ -455,8 +458,12 @@
   def RunGYPGen(self, vals):
     path = self.args.path[0]
 
-    output_dir = self.ParseGYPConfigPath(path)
-    cmd = self.GYPCmd(output_dir, vals['gyp_defines'])
+    output_dir, gyp_config = self.ParseGYPConfigPath(path)
+    if gyp_config != vals['gyp_config']:
+      raise MBErr('The last component of the path (%s) must match the '
+                  'GYP configuration specified in the config (%s), and '
+                  'it does not.' % (gyp_config, vals['gyp_config']))
+    cmd = self.GYPCmd(output_dir, vals['gyp_defines'], config=gyp_config)
     env = None
     if vals['gyp_crosscompile']:
       if self.args.verbose:
@@ -467,7 +474,11 @@
     return ret
 
   def RunGYPAnalyze(self, vals):
-    output_dir = self.ParseGYPConfigPath(self.args.path[0])
+    output_dir, gyp_config = self.ParseGYPConfigPath(self.args.path[0])
+    if gyp_config != vals['gyp_config']:
+      raise MBErr('The last component of the path (%s) must match the '
+                  'GYP configuration specified in the config (%s), and '
+                  'it does not.' % (gyp_config, vals['gyp_config']))
     if self.args.verbose:
       inp = self.ReadInputJSON(['files', 'targets'])
       self.Print()
@@ -475,7 +486,7 @@
       self.PrintJSON(inp)
       self.Print()
 
-    cmd = self.GYPCmd(output_dir, vals['gyp_defines'])
+    cmd = self.GYPCmd(output_dir, vals['gyp_defines'], config=gyp_config)
     cmd.extend(['-f', 'analyzer',
                 '-G', 'config_path=%s' % self.args.input_path[0],
                 '-G', 'analyzer_output_path=%s' % self.args.output_path[0]])
@@ -581,16 +592,26 @@
 
   def ParseGYPConfigPath(self, path):
     rpath = self.ToSrcRelPath(path)
-    output_dir, _, _ = rpath.rpartition('/')
-    return output_dir
-
-  def GYPCmd(self, output_dir, gyp_defines):
+    output_dir, _, config = rpath.rpartition('/')
+    self.CheckGYPConfigIsSupported(config, path)
+    return output_dir, config
+
+  def CheckGYPConfigIsSupported(self, config, path):
+    if config not in ('Debug', 'Release'):
+      if (sys.platform in ('win32', 'cygwin') and
+          config not in ('Debug_x64', 'Release_x64')):
+        raise MBErr('Unknown or unsupported config type "%s" in "%s"' %
+                    config, path)
+
+  def GYPCmd(self, output_dir, gyp_defines, config):
     gyp_defines = gyp_defines.replace("$(goma_dir)", self.args.goma_dir)
     cmd = [
         sys.executable,
         os.path.join('build', 'gyp_chromium'),
         '-G',
         'output_dir=' + output_dir,
+        '-G',
+        'config=' + config,
     ]
     for d in shlex.split(gyp_defines):
       cmd += ['-D', d]