Use data from transitive_proto_sources instead of transitive_sources in proto_lang_toolchain.

comius · copybara-github · commit 8528661de349 · 2022-05-06T01:17:50.000-07:00
The problem with latter is, that transitive_source can contain "renamed" files (in _virtual_includes subdirectory), which doesn't work for the detection that needs original files (ProtoSource.original_source_file).

PiperOrigin-RevId: 446924924
diff --git a/src/main/starlark/builtins_bzl/common/proto/proto_lang_toolchain.bzl b/src/main/starlark/builtins_bzl/common/proto/proto_lang_toolchain.bzl
@@ -22,11 +22,7 @@ ProtoInfo = _builtins.toplevel.ProtoInfo
 proto_common = _builtins.toplevel.proto_common
 
 def _rule_impl(ctx):
-    provided_proto_sources = []
-    transitive_files = depset(transitive = [bp[ProtoInfo].transitive_sources for bp in ctx.attr.blacklisted_protos])
-    for file in transitive_files.to_list():
-        source_root = file.root.path
-        provided_proto_sources.append(proto_common.ProtoSource(file, file, source_root))
+    provided_proto_sources = depset(transitive = [bp[ProtoInfo].transitive_proto_sources() for bp in ctx.attr.blacklisted_protos]).to_list()
 
     flag = ctx.attr.command_line
     if flag.find("$(PLUGIN_OUT)") > -1:
