Modify the gn version of 'mb analyze' to handle GN group targets as well.

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 411 matching lines @@
       return 0
 
     ret = 0
     response_file = self.TempFile()
     response_file.write('\n'.join(inp['files']) + '\n')
     response_file.close()
 
     matching_targets = []
     try:
       cmd = self.GNCmd('refs', self.args.path[0]) + [
-          '@%s' % response_file.name,
-          '--type=executable', '--all', '--as=output'
-      ]
+          '@%s' % response_file.name, '--all', '--as=output']
       ret, out, _ = self.Run(cmd)
       if ret and not 'The input matches no targets' in out:
         self.WriteFailureAndRaise('gn refs returned %d: %s' % (ret, out),
                                   output_path)
       build_dir = self.ToSrcRelPath(self.args.path[0]) + os.sep
       for output in out.splitlines():
         build_output = output.replace(build_dir, '')
         if build_output in inp['targets']:
           matching_targets.append(build_output)
+
+      cmd = self.GNCmd('refs', self.args.path[0]) + [
+          '@%s' % response_file.name, '--all']
+      ret, out, _ = self.Run(cmd)
+      if ret and not 'The input matches no targets' in out:
+        self.WriteFailureAndRaise('gn refs returned %d: %s' % (ret, out),
+                                  output_path)
+      for label in out.splitlines():
+        build_target = label[2:]
+        # We want to accept 'chrome/android:chrome_shell_apk' and
+        # just 'chrome_shell_apk'. This may result in too many targets
+        # getting built, but we can adjust that later if need be.
+        for input_target in inp['targets']:
+          if (input_target == build_target or
+              build_target.endswith(':' + input_target)):
+            matching_targets.append(input_target)
     finally:
       self.RemoveFile(response_file.name)
 
     if matching_targets:
       # TODO: it could be that a target X might depend on a target Y
       # and both would be listed in the input, but we would only need
       # to specify target X as a build_target (whereas both X and Y are
       # targets). I'm not sure if that optimization is generally worth it.
       self.WriteJSON({'targets': sorted(matching_targets),
                       'build_targets': sorted(matching_targets),
@@ skipping 108 matching lines @@
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except MBErr as e:
     print(e)
     sys.exit(1)
   except KeyboardInterrupt:
     print("interrupted, exiting", stream=sys.stderr)
     sys.exit(130)