Bazel: Add fixes for --incompatible_disallow_legacy_java_provider In some places the old style, string-indexed Starlark ‘java’ provider was already replaced with new style javaInfo in: I1d5afb8b022. But some other places were missed to be replaced. Change-Id: Ie5ee9eed689793f532f99aeaa38f12ec87a709e1
diff --git a/tools/bzl/classpath.bzl b/tools/bzl/classpath.bzl index 55479c5..682ee3c 100644 --- a/tools/bzl/classpath.bzl +++ b/tools/bzl/classpath.bzl
@@ -1,9 +1,9 @@ def _classpath_collector(ctx): all = [] for d in ctx.attr.deps: - if hasattr(d, "java"): - all.append(d.java.transitive_runtime_deps) - all.append(d.java.compilation_info.runtime_classpath) + if JavaInfo in d: + all.append(d[JavaInfo].transitive_runtime_deps) + all.append(d[JavaInfo].compilation_info.runtime_classpath) elif hasattr(d, "files"): all.append(d.files)