mb_config.pyl cleanup: remove unused dev configs from MB.

tools/mb/mb.py

 #!/usr/bin/env python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """MB - the Meta-Build wrapper around GYP and GN
 
 MB is a wrapper script for GYP and GN that can be used to generate build files
 for sets of canned configurations and analyze them.
 """
@@ skipping 28 matching lines @@
     self.chromium_src_dir = p.normpath(d(d(d(p.abspath(__file__)))))
     self.default_config = p.join(self.chromium_src_dir, 'tools', 'mb',
                                  'mb_config.pyl')
     self.executable = sys.executable
     self.platform = sys.platform
     self.sep = os.sep
     self.args = argparse.Namespace()
     self.configs = {}
     self.masters = {}
     self.mixins = {}
-    self.private_configs = []
-    self.common_dev_configs = []
-    self.unsupported_configs = []
 
   def Main(self, args):
     self.ParseArgs(args)
     try:
       ret = self.args.func()
       if ret:
         self.DumpInputFiles()
       return ret
     except KeyboardInterrupt:
       self.Print('interrupted, exiting', stream=sys.stderr)
@@ skipping 203 matching lines @@
         force_verbose=False, buffer_output=False)
 
     return ret
 
   def CmdValidate(self):
     errs = []
 
     # Read the file to make sure it parses.
     self.ReadConfigFile()
 
-    # Figure out the whole list of configs and ensure that no config is
-    # listed in more than one category.
+    # Build a list of all of the configs referenced by builders.
     all_configs = {}
-    for config in self.common_dev_configs:
-      all_configs[config] = 'common_dev_configs'
-    for config in self.private_configs:
-      if config in all_configs:
-        errs.append('config "%s" listed in "private_configs" also '
-                    'listed in "%s"' % (config, all_configs['config']))
-      else:
-        all_configs[config] = 'private_configs'
-    for config in self.unsupported_configs:
-      if config in all_configs:
-        errs.append('config "%s" listed in "unsupported_configs" also '
-                    'listed in "%s"' % (config, all_configs['config']))
-      else:
-        all_configs[config] = 'unsupported_configs'
-
     for master in self.masters:
-      for builder in self.masters[master]:
-        config = self.masters[master][builder]
-        if config in all_configs and all_configs[config] not in self.masters:
-          errs.append('Config "%s" used by a bot is also listed in "%s".' %
-                      (config, all_configs[config]))
-        else:
-          all_configs[config] = master
+      for config in self.masters[master].values():
+        all_configs[config] = master
 
     # Check that every referenced config actually exists.
     for config, loc in all_configs.items():
       if not config in self.configs:
         errs.append('Unknown config "%s" referenced from "%s".' %
                     (config, loc))
 
     # Check that every actual config is actually referenced.
     for config in self.configs:
       if not config in all_configs:
@@ skipping 250 matching lines @@
   def ReadConfigFile(self):
     if not self.Exists(self.args.config_file):
       raise MBErr('config file not found at %s' % self.args.config_file)
 
     try:
       contents = ast.literal_eval(self.ReadFile(self.args.config_file))
     except SyntaxError as e:
       raise MBErr('Failed to parse config file "%s": %s' %
                  (self.args.config_file, e))
 
-    self.common_dev_configs = contents['common_dev_configs']
     self.configs = contents['configs']
     self.masters = contents['masters']
     self.mixins = contents['mixins']
-    self.private_configs = contents['private_configs']
-    self.unsupported_configs = contents['unsupported_configs']
 
   def ConfigFromArgs(self):
     if self.args.config:
       if self.args.master or self.args.builder:
         raise MBErr('Can not specific both -c/--config and -m/--master or '
                     '-b/--builder')
 
       return self.args.config
 
     if not self.args.master or not self.args.builder:
@@ skipping 718 matching lines @@
   # Then check to see if the arg contains any metacharacters other than
   # double quotes; if it does, quote everything (including the double
   # quotes) for safety.
   if any(a in UNSAFE_FOR_CMD for a in arg):
     arg = ''.join('^' + a if a in ALL_META_CHARS else a for a in arg)
   return arg
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))