Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Bazel: Remove iteration over depset
Change-Id: Ia8be71266bdbb8ac6bbb007eb235e70fc2d9669f
diff --git a/tools/gwt.bzl b/tools/gwt.bzl
index df01cdb..b6f5a07 100644
--- a/tools/gwt.bzl
+++ b/tools/gwt.bzl
@@ -146,9 +146,7 @@
deps = _get_transitive_closure(ctx)
- paths = []
- for dep in deps:
- paths.append(dep.path)
+ paths = [dep.path for dep in deps.to_list()]
gwt_user_agent_modules = []
ua = _gwt_user_agent_module(ctx)
@@ -183,8 +181,9 @@
])
ctx.actions.run_shell(
- inputs = list(deps) + ctx.files._jdk + ctx.files._zip + gwt_user_agent_modules,
+ inputs = depset(direct = gwt_user_agent_modules, transitive = [deps]),
outputs = [output_zip],
+ tools = ctx.files._jdk + ctx.files._zip,
mnemonic = "GwtBinary",
progress_message = "GWT compiling " + output_zip.short_path,
command = "set -e\n" + cmd,
diff --git a/tools/junit.bzl b/tools/junit.bzl
index 4dfdb61..b4cd558 100644
--- a/tools/junit.bzl
+++ b/tools/junit.bzl
@@ -35,7 +35,7 @@
return -1
def _AsClassName(fname):
- fname = [x.path for x in fname.files][0]
+ fname = [x.path for x in fname.files.to_list()][0]
toks = fname[:-5].split("/")
findex = -1
for s in _PREFIXES:
