Merge branch 'bazelbuild:master' into master

Author: mollyibot

closure/compiler/closure_js_binary.bzl

@@ -291,14 +291,10 @@ def _impl(ctx):
             language = ctx.attr.language,
         ),
         js,
-        DefaultInfo(files = depset(files), runfiles = ctx.runfiles(
-            files = files + ctx.files.data,
-            transitive_files = depset(transitive = [
-                collect_runfiles(deps),
-                collect_runfiles([ctx.attr.css]),
-                collect_runfiles(ctx.attr.data),
-            ]),
-        )),
+        DefaultInfo(
+            files = depset(files),
+            runfiles = collect_runfiles(ctx, files, extra_runfiles_attrs = ["css"]),
+        ),
     ]
 
 def _validate_css_graph(ctx, js):

closure/compiler/closure_js_library.bzl

@@ -410,15 +410,10 @@ def _closure_js_library(ctx):
         DefaultInfo(
             files = depset(),
             # The usual suspects are exported as runfiles, in addition to raw source.
-            runfiles = ctx.runfiles(
-                files = srcs + ctx.files.data,
-                transitive_files = depset(
-                    transitive = [
-                        collect_runfiles(unfurl(ctx.attr.deps, provider = ClosureJsLibraryInfo)),
-                        collect_runfiles(ctx.attr.data),
-                        collect_runfiles(unfurl(ctx.attr.exports)),
-                    ],
-                ),
+           runfiles = collect_runfiles(
+                ctx,
+                files = ctx.files.srcs,
+                extra_runfiles_attrs = ["exports"],
             ),
         ),
     ]

closure/private/defs.bzl

@@ -219,18 +219,27 @@ def collect_css(deps, orientation = None):
         orientation = orientation,
     )
 
-def collect_runfiles(targets):
+def collect_runfiles(ctx, files, extra_runfiles_attrs = None):
     """Aggregates data runfiles from targets."""
-    data = []
-    for target in targets:
-        if hasattr(target, "runfiles"):
-            data.append(target.runfiles.files)
-            continue
-        if hasattr(target, "data_runfiles"):
-            data.append(target.data_runfiles.files)
-        if hasattr(target, "default_runfiles"):
-            data.append(target.default_runfiles.files)
-    return depset(transitive = data)
+    all_transitive_files = []
+    if extra_runfiles_attrs:
+        for extra_attr in extra_runfiles_attrs:
+            deps = getattr(ctx.attr, extra_attr, None) or []
+            if type(deps) != "list":
+                deps = [deps]
+            for dep in deps:
+                info = dep[DefaultInfo]
+                all_transitive_files.append(info.default_runfiles.files)
+                all_transitive_files.append(info.data_runfiles.files)
+
+    return ctx.runfiles(
+        collect_default = True,
+        collect_data = True,
+        files = files,
+        transitive_files = depset(
+            transitive = all_transitive_files,
+        ),
+    )
 
 def find_js_module_roots(srcs, workspace_name, label, includes):
     """Finds roots of JavaScript sources.

closure/stylesheets/closure_css_binary.bzl

@@ -92,12 +92,7 @@ def _closure_css_binary(ctx):
         ),
         DefaultInfo(
             files = depset(files),
-            runfiles = ctx.runfiles(
-                files = files + ctx.files.data,
-                transitive_files = depset(
-                    transitive = [collect_runfiles(deps), collect_runfiles(ctx.attr.data)],
-                ),
-            ),
+            runfiles = collect_runfiles(ctx, files),
         ),
     ]
 

closure/stylesheets/closure_css_library.bzl

@@ -37,12 +37,7 @@ def _closure_css_library(ctx):
         ClosureJsLibraryInfo(),
         DefaultInfo(
             files = depset(),
-            runfiles = ctx.runfiles(
-                files = ctx.files.srcs + ctx.files.data,
-                transitive_files = depset(
-                    transitive = [collect_runfiles(deps), collect_runfiles(ctx.attr.data)],
-                ),
-            ),
+            runfiles = collect_runfiles(ctx, ctx.files.srcs),
         ),
     ]
 

closure/testing/phantomjs_test.bzl

@@ -58,17 +58,10 @@ def _impl(ctx):
     )
     return DefaultInfo(
         files = depset(files),
-        runfiles = ctx.runfiles(
-            files = files + ctx.attr.data + [ctx.file.html],
-            transitive_files = depset(transitive = [
-                collect_runfiles(deps),
-                collect_runfiles(ctx.attr.data),
-                collect_runfiles([
-                    ctx.attr._phantomjs,
-                    ctx.attr.runner,
-                    ctx.attr.harness,
-                ]),
-            ]),
+        runfiles = collect_runfiles(
+            ctx,
+            files = files + [ctx.file.html],
+            extra_runfiles_attrs = ["_phantomjs", "runner", "harness"],
         ),
     )
 

closure/webfiles/web_library.bzl

@@ -81,10 +81,10 @@ def _web_library(ctx):
     manifest = ctx.actions.declare_file("%s.pbtxt" % ctx.label.name)
     ctx.actions.write(
         output = manifest,
-        content = struct(
+        content = proto.encode_text(struct(
             label = str(ctx.label),
             src = manifest_srcs,
-        ).to_proto(),
+        )),
     )
     manifests = depset([manifest], transitive = manifests, order = "postorder")
 
@@ -137,7 +137,7 @@ def _web_library(ctx):
         ],
     )
     params_file = ctx.actions.declare_file("%s_server_params.pbtxt" % ctx.label.name)
-    ctx.actions.write(output = params_file, content = params.to_proto())
+    ctx.actions.write(output = params_file, content = proto.encode_text(params))
     ctx.actions.write(
         is_executable = True,
         output = ctx.outputs.executable,