Implement recursive gyp dependencies for Closure Compilation

BUG=78368
R=dbeam@chromium.org
TEST=GYP_GENERATORS=ninja gyp --depth . third_party/closure_compiler/compiled_resources.gyp && ninja -C out/Default

Review URL: https://codereview.chromium.org/599203003

Cr-Commit-Position: refs/heads/master@{#297314}

chrome/browser/resources/downloads/compiled_resources.gyp

@@ -8,7 +8,7 @@
       'variables': {
         'depends': [
           '../../../../ui/webui/resources/js/cr.js',
-          '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../ui/webui/resources/js/util.js',
         ],
         'externs': ['<(CLOSURE_DIR)/externs/chrome_send_externs.js'],

chrome/browser/resources/history/compiled_resources.gyp

@@ -21,7 +21,7 @@
           '../../../../ui/webui/resources/js/cr/ui/overlay.js',
           '../../../../ui/webui/resources/js/cr/ui/position_util.js',
           '../../../../ui/webui/resources/js/event_tracker.js',
-          '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../ui/webui/resources/js/util.js',
           'history_focus_manager.js',
         ],

chrome/browser/resources/uber/compiled_resources.gyp

@@ -8,7 +8,7 @@
       'variables': {
         'depends': [
           '../../../../ui/webui/resources/js/cr.js',
-          '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../ui/webui/resources/js/util.js',
         ],
         'externs': ['<(CLOSURE_DIR)/externs/chrome_send_externs.js'],
@@ -20,7 +20,7 @@
       'variables': {
         'depends': [
           '../../../../ui/webui/resources/js/cr.js',
-          '../../../../ui/webui/resources/js/load_time_data.js',
+          '../../../../ui/webui/resources/js/compiled_resources.gyp:load_time_data',
           '../../../../ui/webui/resources/js/util.js',
           'uber_utils.js',
         ],

third_party/closure_compiler/build/inputs.py

@@ -4,6 +4,8 @@
 # found in the LICENSE file.
 
 import argparse
+import ast
+import collections
 import os
 import sys
 
@@ -12,17 +14,79 @@ sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
 import processor
 
 
+def remove_duplicates_with_order(has_duplicates):
+  return list(collections.OrderedDict.fromkeys(has_duplicates))
+
+
+def expand_depends(source, dep):
+  if ":" not in dep:
+    return [dep], {}
+
+  gyp_relative_path, target = dep.split(":")
+  gyp_path = os.path.join(os.path.dirname(source), gyp_relative_path)
+  gyp_content = ast.literal_eval(open(gyp_path).read())
+
+  for target_description in gyp_content["targets"]:
+    if target_description["target_name"] == target:
+      break
+  else:
+    raise ValueError("Target '%s' not found in file '%s'" %
+                     (target, gyp_path))
+
+  depends = []
+  externs = []
+  if "variables" in target_description:
+    depends = target_description["variables"].get("depends", [])
+    externs = target_description["variables"].get("externs", [])
+
+  def attach_gyp_dir(relative_path):
+    return os.path.join(os.path.dirname(gyp_path), relative_path)
+
+  target_source = attach_gyp_dir(target + ".js")
+  expanded_depends, expanded_externs = resolve_recursive_dependencies(
+      target_source,
+      depends,
+      externs)
+
+  expanded_depends = map(attach_gyp_dir, expanded_depends)
+  expanded_externs = set(map(attach_gyp_dir, expanded_externs))
+
+  expanded_depends.append(target_source)
+
+  return expanded_depends, expanded_externs
+
+
+def resolve_recursive_dependencies(source, input_depends, depends_externs):
+  output_depends = []
+  output_externs = set(depends_externs)
+
+  for depends in input_depends:
+    expanded_depends, expanded_externs = expand_depends(source, depends)
+    output_depends.extend(expanded_depends)
+    output_externs.update(expanded_externs)
+
+  output_depends = remove_duplicates_with_order(output_depends)
+
+  return output_depends, output_externs
+
+
 def GetInputs(args):
   parser = argparse.ArgumentParser()
-  parser.add_argument("sources", nargs=argparse.ONE_OR_MORE)
+  parser.add_argument("source", nargs=1)
   parser.add_argument("-d", "--depends", nargs=argparse.ZERO_OR_MORE,
                       default=[])
   parser.add_argument("-e", "--externs", nargs=argparse.ZERO_OR_MORE,
                       default=[])
   opts = parser.parse_args(args)
 
+  source = opts.source[0]
+  depends, externs = resolve_recursive_dependencies(
+      source,
+      opts.depends,
+      opts.externs)
+
   files = set()
-  for file in opts.sources + opts.depends + opts.externs:
+  for file in {source} | set(depends) | externs:
     files.add(file)
     files.update(processor.Processor(file).included_files)
 

third_party/closure_compiler/checker.py

@@ -11,6 +11,8 @@ import re
 import subprocess
 import sys
 import tempfile
+
+import build.inputs
 import processor
 
 
@@ -168,7 +170,7 @@ class Checker(object):
             and its output (as a string).
     """
     depends = depends or []
-    externs = externs or []
+    externs = externs or set()
 
     if not self._check_java_path():
       return 1, ""
@@ -233,7 +235,11 @@ if __name__ == "__main__":
 
   checker = Checker(verbose=opts.verbose)
   for source in opts.sources:
-    exit, _ = checker.check(source, depends=opts.depends, externs=opts.externs)
+    depends, externs = build.inputs.resolve_recursive_dependencies(
+        source,
+        opts.depends,
+        opts.externs)
+    exit, _ = checker.check(source, depends=depends, externs=externs)
     if exit != 0:
       sys.exit(exit)
 

ui/webui/resources/js/chromeos/compiled_resources.gyp

@@ -8,7 +8,7 @@
       'variables': {
         'depends': [
           '../cr.js',
-          '../load_time_data.js'
+          '../compiled_resources.gyp:load_time_data',
         ],
       },
       'includes': ['../../../../../third_party/closure_compiler/compile_js.gypi'],

ui/webui/resources/js/compiled_resources.gyp

@@ -17,6 +17,13 @@
     },
     {
       'target_name': 'load_time_data',
+      'variables': {
+        'depends': [
+          '../../../../third_party/jstemplate/util.js',
+          '../../../../third_party/jstemplate/jsevalcontext.js',
+          '../../../../third_party/jstemplate/jstemplate.js',
+        ],
+      },
       'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
     },
     {
@@ -37,18 +44,14 @@
     {
       'target_name': 'i18n_template_no_process',
       'variables': {
-        'depends': ['load_time_data.js'],
+        'depends': ['compiled_resources.gyp:load_time_data'],
       },
       'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
     },
-    {
-      'target_name': 'i18n_template',
-      'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
-    },
     {
       'target_name': 'i18n_template2',
       'variables': {
-        'depends': ['load_time_data.js'],
+        'depends': ['compiled_resources.gyp:load_time_data'],
       },
       'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],
     },