diff --git a/tools/bzl/javadoc.bzl b/tools/bzl/javadoc.bzl index 638721053d..754bd961cf 100644 --- a/tools/bzl/javadoc.bzl +++ b/tools/bzl/javadoc.bzl @@ -17,8 +17,8 @@ def _impl(ctx): zip_output = ctx.outputs.zip - transitive_jars = depset(transitive = [l.java.transitive_deps for l in ctx.attr.libs]) - source_jars = depset(transitive = [l.java.source_jars for l in ctx.attr.libs]) + transitive_jars = depset(transitive = [j.java.transitive_deps for j in ctx.attr.libs]) + source_jars = depset(transitive = [j.java.source_jars for j in ctx.attr.libs]) transitive_jar_paths = [j.path for j in transitive_jars.to_list()] dir = ctx.outputs.zip.path + ".dir" diff --git a/tools/bzl/junit.bzl b/tools/bzl/junit.bzl index b4cd558938..f56dd65004 100644 --- a/tools/bzl/junit.bzl +++ b/tools/bzl/junit.bzl @@ -28,8 +28,8 @@ public class %s {} _PREFIXES = ("org", "com", "edu") -def _SafeIndex(l, val): - for i, v in enumerate(l): +def _SafeIndex(j, val): + for i, v in enumerate(j): if val == v: return i return -1 diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl index 5c07987732..72ed9f878f 100644 --- a/tools/bzl/pkg_war.bzl +++ b/tools/bzl/pkg_war.bzl @@ -76,11 +76,11 @@ def _war_impl(ctx): # Add lib transitive_libs = [] - for l in ctx.attr.libs: - if hasattr(l, "java"): - transitive_libs.append(l.java.transitive_runtime_deps) - elif hasattr(l, "files"): - transitive_libs.append(l.files) + for j in ctx.attr.libs: + if hasattr(j, "java"): + transitive_libs.append(j.java.transitive_runtime_deps) + elif hasattr(j, "files"): + transitive_libs.append(j.files) transitive_lib_deps = depset(transitive = transitive_libs) for dep in transitive_lib_deps.to_list(): @@ -89,8 +89,8 @@ def _war_impl(ctx): # Add pgm lib transitive_pgmlibs = [] - for l in ctx.attr.pgmlibs: - transitive_pgmlibs.append(l.java.transitive_runtime_deps) + for j in ctx.attr.pgmlibs: + transitive_pgmlibs.append(j.java.transitive_runtime_deps) transitive_pgmlib_deps = depset(transitive = transitive_pgmlibs) for dep in transitive_pgmlib_deps.to_list():