commit 60203aa9747ba8e35fcb9bb6541083ea47d1be50
author Googler <lberki@google.com> Fri Aug 09 05:06:06 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Aug 09 05:08:29 2024 -0700
tree d13907ea9dbc102a5b58faa67e4417651002b97f
parent 620556835c6151a69d64fb770ec555ba278ecec1

Make it possible for aspects to provide FileProvider.

This will then be merged with the FileProvider of the associated configured target.

RELNOTES[NEW]: aspects can now return DefaultInfo, which will then be merged with that of the configured target they are applied to. Currently, only the files= field is supported.

PiperOrigin-RevId: 661221846
Change-Id: I15a95220b9ea263e3e2125f80c8acadd80078565

src/main/java/com/google/devtools/build/lib/analysis/AspectBaseTargetResolvedToolchainContext.java

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/AspectBaseTargetResolvedToolchainContext.java b/src/main/java/com/google/devtools/build/lib/analysis/AspectBaseTargetResolvedToolchainContext.java
index e27fd48..3fb9985 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/AspectBaseTargetResolvedToolchainContext.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/AspectBaseTargetResolvedToolchainContext.java
@@ -20,6 +20,7 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget;
+import com.google.devtools.build.lib.analysis.configuredtargets.MergedConfiguredTarget.MergingException;
 import com.google.devtools.build.lib.analysis.platform.ToolchainTypeInfo;
 import com.google.devtools.build.lib.cmdline.Label;
 import com.google.devtools.build.lib.packages.Provider;
@@ -47,7 +48,7 @@
       UnloadedToolchainContext unloadedToolchainContext,
       String targetDescription,
       ImmutableMultimap<ToolchainTypeInfo, ConfiguredTargetAndData> toolchainTargets)
-      throws DuplicateException {
+      throws MergingException {
 
     ImmutableMap.Builder<ToolchainTypeInfo, ToolchainAspectsProviders> toolchainsBuilder =
         new ImmutableMap.Builder<>();