diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 14 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java | 12 |
2 files changed, 11 insertions, 15 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 781bc12058..d5175b4837 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 @@ -61,7 +61,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArgs.ClasspathTyp import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaCompilationHelper; -import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar; @@ -792,18 +791,19 @@ public class AndroidCommon { recursiveJavaCompilationArgs, compileTimeDependencyArtifacts, NestedSetBuilder.<Artifact>emptySet(Order.STABLE_ORDER)); - javaCommon.addTransitiveInfoProviders(builder, filesToBuild, classJar, ANDROID_COLLECTION_SPEC); - JavaGenJarsProvider javaGenJarsProvider = - javaCommon.createJavaGenJarsProvider(genClassJar, genSourceJar); - javaCommon.addJavaGenJarsProvider(builder, javaGenJarsProvider); + JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); + + javaCommon.addTransitiveInfoProviders( + builder, javaInfoBuilder, filesToBuild, classJar, ANDROID_COLLECTION_SPEC); + + javaCommon.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); DataBinding.maybeAddProvider(builder, ruleContext); - JavaInfo javaInfo = JavaInfo.Builder.create() + JavaInfo javaInfo = javaInfoBuilder .addProvider(JavaCompilationArgsProvider.class, compilationArgsProvider) .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) - .addProvider(JavaGenJarsProvider.class, javaGenJarsProvider) .build(); return builder 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 0842f68305..87fa14562b 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 @@ -45,7 +45,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaCompilationHelper; import com.google.devtools.build.lib.rules.java.JavaConfiguration; import com.google.devtools.build.lib.rules.java.JavaConfiguration.OneVersionEnforcementLevel; -import com.google.devtools.build.lib.rules.java.JavaGenJarsProvider; import com.google.devtools.build.lib.rules.java.JavaHelper; import com.google.devtools.build.lib.rules.java.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaPrimaryClassProvider; @@ -301,11 +300,10 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor JavaRuleOutputJarsProvider ruleOutputJarsProvider = javaRuleOutputJarsProviderBuilder.build(); - javaCommon.addTransitiveInfoProviders(builder, filesToBuild, classJar); + JavaInfo.Builder javaInfoBuilder = JavaInfo.Builder.create(); - JavaGenJarsProvider javaGenJarsProvider = - javaCommon.createJavaGenJarsProvider(genClassJar, genSourceJar); - javaCommon.addJavaGenJarsProvider(builder, javaGenJarsProvider); + javaCommon.addTransitiveInfoProviders(builder, javaInfoBuilder, filesToBuild, classJar); + javaCommon.addGenJarsProvider(builder, javaInfoBuilder, genClassJar, genSourceJar); // Just confirming that there are no aliases being used here. AndroidFeatureFlagSetProvider.getAndValidateFlagMapFromRuleContext(ruleContext); @@ -317,11 +315,9 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor NestedSet<Artifact> extraFilesToRun = NestedSetBuilder.create(Order.STABLE_ORDER, runfilesSupport.getRunfilesMiddleman()); - JavaInfo javaInfo = - JavaInfo.Builder.create() + JavaInfo javaInfo = javaInfoBuilder .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) - .addProvider(JavaGenJarsProvider.class, javaGenJarsProvider) .build(); return builder |