diff options
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java | 14 |
1 files changed, 9 insertions, 5 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 c403b05768..bb63208218 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 @@ -60,6 +60,7 @@ 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.JavaInfo; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider; import com.google.devtools.build.lib.rules.java.JavaRuleOutputJarsProvider.OutputJar; import com.google.devtools.build.lib.rules.java.JavaRuntimeJarProvider; @@ -183,8 +184,8 @@ public class AndroidCommon { if (JavaCommon.isNeverLink(ruleContext)) { builder.addAll(runtimeJars); - for (JavaCompilationArgsProvider provider : AnalysisUtils.getProviders( - deps, JavaCompilationArgsProvider.class)) { + for (JavaCompilationArgsProvider provider : + JavaInfo.getProvidersFromListOfTargets(JavaCompilationArgsProvider.class, deps)) { builder.addTransitive(provider.getRecursiveJavaCompilationArgs().getRuntimeJars()); } } @@ -792,13 +793,17 @@ public class AndroidCommon { javaCommon.addGenJarsProvider(builder, genClassJar, genSourceJar); DataBinding.maybeAddProvider(builder, ruleContext); + JavaInfo javaInfo = JavaInfo.Builder.create() + .addProvider(JavaCompilationArgsProvider.class, compilationArgsProvider) + .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) + .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) + .build(); return builder .setFilesToBuild(filesToBuild) .addSkylarkTransitiveInfo( JavaSkylarkApiProvider.NAME, JavaSkylarkApiProvider.fromRuleContext()) - .addProvider(JavaRuleOutputJarsProvider.class, ruleOutputJarsProvider) - .addProvider(JavaSourceJarsProvider.class, sourceJarsProvider) + .addNativeDeclaredProvider(javaInfo) .addProvider( JavaRuntimeJarProvider.class, new JavaRuntimeJarProvider(javaCommon.getJavaCompilationArtifacts().getRuntimeJars())) @@ -818,7 +823,6 @@ public class AndroidCommon { zipAlignedApk, apksUnderTest, nativeLibs)) - .addProvider(JavaCompilationArgsProvider.class, compilationArgsProvider) .addSkylarkTransitiveInfo(AndroidSkylarkApiProvider.NAME, new AndroidSkylarkApiProvider()) .addOutputGroup( OutputGroupProvider.HIDDEN_TOP_LEVEL, collectHiddenTopLevelArtifacts(ruleContext)) |