diff options
8 files changed, 19 insertions, 19 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java index 7feb1d2bcb..edeee584dd 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java @@ -694,7 +694,7 @@ public class AndroidCommon { javaCommon.addTransitiveInfoProviders( builder, javaInfoBuilder, filesToBuild, classJar, ANDROID_COLLECTION_SPEC); - javaCommon.addGenJarsProvider(javaInfoBuilder, genClassJar, genSourceJar); + javaCommon.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); DataBinding.maybeAddProvider(builder, ruleContext); JavaInfo javaInfo = diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java index 4b90d7ace6..f32ea9c9bf 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java @@ -365,7 +365,7 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); javaCommon.addTransitiveInfoProviders(builder, javaInfoBuilder, filesToBuild, classJar); - javaCommon.addGenJarsProvider(javaInfoBuilder, genClassJar, genSourceJar); + javaCommon.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); // Just confirming that there are no aliases being used here. AndroidFeatureFlagSetProvider.getAndValidateFlagMapFromRuleContext(ruleContext); diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java index d5214126b2..c954a9fa9e 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/DexArchiveAspect.java @@ -341,7 +341,7 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu private static ImmutableList<Artifact> getBootclasspath( ConfiguredTarget base, RuleContext ruleContext) { JavaCompilationInfoProvider compilationInfo = - JavaInfo.getProvider(JavaCompilationInfoProvider.class, base); + base.getProvider(JavaCompilationInfoProvider.class); if (compilationInfo == null || compilationInfo.getBootClasspath().isEmpty()) { return ImmutableList.of( ruleContext diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java index 750507d9d7..6bba8faf1b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java @@ -438,7 +438,7 @@ public class JavaBinary implements RuleConfiguredTargetFactory { JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); common.addTransitiveInfoProviders(builder, javaInfoBuilder, filesToBuild, classJar); - common.addGenJarsProvider(javaInfoBuilder, genClassJar, genSourceJar); + common.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); JavaInfo javaInfo = javaInfoBuilder .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java index 6c39ae6316..7da5b33810 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java @@ -400,7 +400,7 @@ public class JavaCommon { builder.addAll(Iterables.transform(currentRuleExports, TransitiveInfoCollection::getLabel)); for (TransitiveInfoCollection dep : currentRuleExports) { - JavaExportsProvider exportsProvider = JavaInfo.getProvider(JavaExportsProvider.class, dep); + JavaExportsProvider exportsProvider = dep.getProvider(JavaExportsProvider.class); if (exportsProvider != null) { builder.addTransitive(exportsProvider.getTransitiveExports()); @@ -687,7 +687,9 @@ public class JavaCommon { .add( InstrumentedFilesProvider.class, getInstrumentationFilesProvider(ruleContext, filesToBuild, instrumentationSpec)) - .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, getFilesToCompile(classJar)); + .add(JavaExportsProvider.class, exportsProvider) + .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, getFilesToCompile(classJar)) + .add(JavaCompilationInfoProvider.class, compilationInfoProvider); javaInfoBuilder.addProvider(JavaExportsProvider.class, exportsProvider); javaInfoBuilder.addProvider(JavaCompilationInfoProvider.class, compilationInfoProvider); @@ -706,6 +708,7 @@ public class JavaCommon { } public void addGenJarsProvider( + RuleConfiguredTargetBuilder builder, JavaInfo.Builder javaInfoBuilder, @Nullable Artifact genClassJar, @Nullable Artifact genSourceJar) { @@ -717,6 +720,8 @@ public class JavaCommon { activePlugins, getDependencies(JavaGenJarsProvider.class)); + builder.addProvider(JavaGenJarsProvider.class, genJarsProvider); + javaInfoBuilder.addProvider(JavaGenJarsProvider.class, genJarsProvider); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java index 815f2bfb0a..b9f7360557 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaLibrary.java @@ -184,7 +184,7 @@ public class JavaLibrary implements RuleConfiguredTargetFactory { JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); common.addTransitiveInfoProviders(builder, javaInfoBuilder, filesToBuild, classJar); - common.addGenJarsProvider(javaInfoBuilder, genClassJar, genSourceJar); + common.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); NestedSet<Artifact> proguardSpecs = new ProguardLibrary(ruleContext).collectProguardSpecs(); diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index 5caae39afa..f118597eda 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -308,7 +308,7 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF JavaInfo.getProvider(JavaCompilationArgsProvider.class, base); JavaSourceInfoProvider sourceInfoProvider = JavaInfo.getProvider(JavaSourceInfoProvider.class, base); - JavaGenJarsProvider genJarProvider = JavaInfo.getProvider(JavaGenJarsProvider.class, base); + JavaGenJarsProvider genJarProvider = base.getProvider(JavaGenJarsProvider.class); ImmutableSet.Builder<Artifact> javaSourceFilesBuilder = ImmutableSet.builder(); ImmutableSet.Builder<Artifact> javaSourceJarsBuilder = ImmutableSet.builder(); if (sourceInfoProvider != null) { diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index 5b803e0761..bb9d76d744 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -477,9 +477,8 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { " srcs = ['dummy4.java'])"); ConfiguredTarget target = getConfiguredTarget("//java/com/google/exports:dummy"); - List<Label> exports = - ImmutableList.copyOf( - JavaInfo.getProvider(JavaExportsProvider.class, target).getTransitiveExports()); + List<Label> exports = ImmutableList.copyOf( + target.getProvider(JavaExportsProvider.class).getTransitiveExports()); assertThat(exports) .containsExactly( Label.parseAbsolute("//java/com/google/exports:dummy2", ImmutableMap.of()), @@ -1751,13 +1750,11 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { Iterable<String> c1Jars = ActionsTestUtil.baseArtifactNames( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, c1Target) - .getCompilationClasspath()); + c1Target.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); Iterable<String> c2Jars = ActionsTestUtil.baseArtifactNames( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, c2Target) - .getCompilationClasspath()); + c2Target.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); assertThat(c1Jars).containsExactly("liba-hjar.jar"); assertThat(c2Jars).containsExactly("liba-hjar.jar"); @@ -1777,12 +1774,10 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ImmutableList<Artifact> bClasspath = ImmutableList.copyOf( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, bTarget) - .getCompilationClasspath()); + bTarget.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); ImmutableList<Artifact> cClasspath = ImmutableList.copyOf( - JavaInfo.getProvider(JavaCompilationInfoProvider.class, cTarget) - .getCompilationClasspath()); + cTarget.getProvider(JavaCompilationInfoProvider.class).getCompilationClasspath()); assertThat(bClasspath).isEmpty(); assertThat(cClasspath) |