Native aspects can opt-in to apply to files.
Only works for top-level targets.
RELNOTES: None.
PiperOrigin-RevId: 154176914
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
index 48563a1..54ea96c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/AspectTest.java
@@ -24,10 +24,14 @@
import static org.junit.Assert.fail;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.eventbus.EventBus;
import com.google.devtools.build.lib.actions.Artifact;
import com.google.devtools.build.lib.actions.util.ActionsTestUtil.NullAction;
+import com.google.devtools.build.lib.analysis.BuildView.AnalysisResult;
import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
import com.google.devtools.build.lib.analysis.util.TestAspects;
+import com.google.devtools.build.lib.analysis.util.TestAspects.AspectApplyingToFiles;
import com.google.devtools.build.lib.analysis.util.TestAspects.AspectInfo;
import com.google.devtools.build.lib.analysis.util.TestAspects.AspectRequiringRule;
import com.google.devtools.build.lib.analysis.util.TestAspects.BaseRule;
@@ -42,6 +46,7 @@
import com.google.devtools.build.lib.packages.AspectParameters;
import com.google.devtools.build.lib.packages.NativeAspectClass;
import com.google.devtools.build.lib.packages.RuleClass;
+import com.google.devtools.build.lib.skyframe.AspectValue;
import com.google.devtools.build.lib.vfs.ModifiedFileSet;
import java.util.ArrayList;
import java.util.List;
@@ -781,4 +786,24 @@
"Aspect 'FalseAdvertisementAspect', applied to '//a:s',"
+ " does not provide advertised provider 'advertised_provider'");
}
+
+ @Test
+ public void aspectApplyingtToFiles() throws Exception {
+ AspectApplyingToFiles aspectApplyingToFiles = new AspectApplyingToFiles();
+ setRulesAndAspectsAvailableInTests(
+ ImmutableList.<NativeAspectClass>of(aspectApplyingToFiles),
+ ImmutableList.<RuleDefinition>of());
+ pkg(
+ "a",
+ "java_binary(name = 'x', main_class = 'x.FooBar', srcs = ['x.java'])"
+ );
+ AnalysisResult analysisResult = update(new EventBus(), defaultFlags(),
+ ImmutableList.of(aspectApplyingToFiles.getName()),
+ "//a:x_deploy.jar");
+ AspectValue aspect = Iterables.getOnlyElement(analysisResult.getAspects());
+ AspectApplyingToFiles.Provider provider =
+ aspect.getConfiguredAspect().getProvider(AspectApplyingToFiles.Provider.class);
+ assertThat(provider.getLabel())
+ .isEqualTo(Label.parseAbsoluteUnchecked("//a:x_deploy.jar"));
+ }
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
index 1cd5685..7aa206f 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/AnalysisTestCase.java
@@ -41,6 +41,7 @@
import com.google.devtools.build.lib.cmdline.RepositoryName;
import com.google.devtools.build.lib.exec.ExecutionOptions;
import com.google.devtools.build.lib.flags.InvocationPolicyEnforcer;
+import com.google.devtools.build.lib.packages.NativeAspectClass;
import com.google.devtools.build.lib.packages.PackageFactory;
import com.google.devtools.build.lib.packages.Target;
import com.google.devtools.build.lib.packages.util.MockToolsConfig;
@@ -465,11 +466,28 @@
/**
* Makes {@code rules} available in tests, in addition to all the rules available to Blaze at
* running time (e.g., java_library).
+ *
+ * Also see {@link AnalysisTestCase#setRulesAndAspectsAvailableInTests(Iterable, Iterable)}.
*/
protected final void setRulesAvailableInTests(RuleDefinition... rules) throws Exception {
+ setRulesAndAspectsAvailableInTests(
+ ImmutableList.<NativeAspectClass>of(),
+ ImmutableList.copyOf(rules));
+ }
+
+ /**
+ * Makes {@code aspects} and {@code rules} available in tests, in addition to
+ * all the rules available to Blaze at running time (e.g., java_library).
+ */
+ protected final void setRulesAndAspectsAvailableInTests(
+ Iterable<NativeAspectClass> aspects,
+ Iterable<RuleDefinition> rules) throws Exception {
ConfiguredRuleClassProvider.Builder builder =
new ConfiguredRuleClassProvider.Builder();
TestRuleClassProvider.addStandardRules(builder);
+ for (NativeAspectClass aspect : aspects) {
+ builder.addNativeAspectClass(aspect);
+ }
for (RuleDefinition rule : rules) {
builder.addRuleDefinition(rule);
}
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
index 696027c..0070224 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/TestAspects.java
@@ -1124,4 +1124,36 @@
.build();
}
}
+
+ /** Aspect that propagates over rule outputs. */
+ public static class AspectApplyingToFiles extends NativeAspectClass
+ implements ConfiguredAspectFactory {
+
+ /** Simple provider for testing */
+ @Immutable
+ public static final class Provider implements TransitiveInfoProvider {
+ private final Label label;
+
+ private Provider(Label label) {
+ this.label = label;
+ }
+
+ public Label getLabel() {
+ return label;
+ }
+ }
+
+ @Override
+ public AspectDefinition getDefinition(AspectParameters aspectParameters) {
+ return AspectDefinition.builder(this).applyToFiles(true).build();
+ }
+
+ @Override
+ public ConfiguredAspect create(ConfiguredTarget base, RuleContext context,
+ AspectParameters parameters) throws InterruptedException {
+ return ConfiguredAspect.builder(this, parameters, context)
+ .addProvider(Provider.class, new Provider(base.getLabel()))
+ .build();
+ }
+ }
}
