diff options
7 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 1c9d30a6bc..9455863933 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -1048,6 +1048,7 @@ java_library( "rules/java/JavaSemantics.java", "rules/java/JavaSkylarkApiProvider.java", "rules/java/JavaSkylarkCommon.java", + "rules/java/JavaSourceInfoProvider.java", "rules/java/JavaSourceJarsProvider.java", "rules/java/JavaStrictCompilationArgsProvider.java", "rules/java/JavaTargetAttributes.java", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java index 1c6f6d7882..710978a318 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaLibraryRule.java @@ -30,7 +30,6 @@ import com.google.devtools.build.lib.rules.cpp.CppConfiguration; import com.google.devtools.build.lib.rules.cpp.CppRuleClasses; import com.google.devtools.build.lib.rules.java.JavaConfiguration; import com.google.devtools.build.lib.rules.java.JavaInfo; -import com.google.devtools.build.lib.rules.java.JavaSourceInfoProvider; import com.google.devtools.build.lib.rules.java.ProguardLibraryRule; /** @@ -154,7 +153,6 @@ public final class BazelJavaLibraryRule implements RuleDefinition { .cfg(HostTransition.INSTANCE) .allowedRuleClasses("java_plugin") .allowedFileTypes()) - .advertiseProvider(JavaSourceInfoProvider.class) .advertiseSkylarkProvider(SkylarkProviderIdentifier.forKey(JavaInfo.PROVIDER.getKey())) .addRequiredToolchains(CppRuleClasses.ccToolchainTypeAttribute(env)) .build(); 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 d84c653ed5..4b90d7ace6 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 @@ -381,6 +381,9 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor javaInfoBuilder .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) + .addProvider(JavaSourceInfoProvider.class, + JavaSourceInfoProvider.fromJavaTargetAttributes( + helper.getAttributes(), javaSemantics)) .build(); return builder @@ -401,9 +404,6 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor JavaRuntimeClasspathProvider.class, new JavaRuntimeClasspathProvider(javaCommon.getRuntimeClasspath())) .addProvider(JavaPrimaryClassProvider.class, new JavaPrimaryClassProvider(testClass)) - .addProvider( - JavaSourceInfoProvider.class, - JavaSourceInfoProvider.fromJavaTargetAttributes(helper.getAttributes(), javaSemantics)) .addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars) .build(); } 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 2a5cd4bd08..750507d9d7 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 @@ -443,6 +443,8 @@ public class JavaBinary implements RuleConfiguredTargetFactory { JavaInfo javaInfo = javaInfoBuilder .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) + .addProvider(JavaSourceInfoProvider.class, + JavaSourceInfoProvider.fromJavaTargetAttributes(attributes, semantics)) .build(); return builder @@ -460,9 +462,6 @@ public class JavaBinary implements RuleConfiguredTargetFactory { .add( JavaRuntimeClasspathProvider.class, new JavaRuntimeClasspathProvider(common.getRuntimeClasspath())) - .add( - JavaSourceInfoProvider.class, - JavaSourceInfoProvider.fromJavaTargetAttributes(attributes, semantics)) .addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveSourceJars) .build(); } diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java index 32f8d134be..280354f64b 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaImport.java @@ -143,6 +143,7 @@ public class JavaImport implements RuleConfiguredTargetFactory { .addProvider(JavaCompilationArgsProvider.class, compilationArgsProvider) .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) + .addProvider(JavaSourceInfoProvider.class, javaSourceInfoProvider) .setRuntimeJars(javaArtifacts.getRuntimeJars()) .setJavaConstraints(JavaCommon.getConstraints(ruleContext)) .setNeverlink(neverLink) @@ -157,7 +158,6 @@ public class JavaImport implements RuleConfiguredTargetFactory { .add( JavaNativeLibraryProvider.class, new JavaNativeLibraryProvider(transitiveJavaNativeLibraries)) - .add(JavaSourceInfoProvider.class, javaSourceInfoProvider) .addNativeDeclaredProvider(new ProguardSpecProvider(proguardSpecs)) .addOutputGroup(JavaSemantics.SOURCE_JARS_OUTPUT_GROUP, transitiveJavaSourceJars) .addOutputGroup(OutputGroupInfo.HIDDEN_TOP_LEVEL, proguardSpecs) diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java index ec3ad4727f..34f7eac7a4 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaInfo.java @@ -77,7 +77,8 @@ public final class JavaInfo extends NativeInfo implements JavaInfoApi<Artifact> JavaGenJarsProvider.class, JavaExportsProvider.class, JavaCompilationInfoProvider.class, - JavaStrictCompilationArgsProvider.class); + JavaStrictCompilationArgsProvider.class, + JavaSourceInfoProvider.class); private final TransitiveInfoProviderMap providers; 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 39cfb190aa..5caae39afa 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 @@ -306,7 +306,8 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF throws InterruptedException, ActionConflictException { JavaCompilationArgsProvider compilationArgsProvider = JavaInfo.getProvider(JavaCompilationArgsProvider.class, base); - JavaSourceInfoProvider sourceInfoProvider = base.getProvider(JavaSourceInfoProvider.class); + JavaSourceInfoProvider sourceInfoProvider = + JavaInfo.getProvider(JavaSourceInfoProvider.class, base); JavaGenJarsProvider genJarProvider = JavaInfo.getProvider(JavaGenJarsProvider.class, base); ImmutableSet.Builder<Artifact> javaSourceFilesBuilder = ImmutableSet.builder(); ImmutableSet.Builder<Artifact> javaSourceJarsBuilder = ImmutableSet.builder(); |