diff options
| author |  elenairina <elenairina@google.com> | 2018-07-30 08:23:59 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-07-30 08:25:19 -0700 |
| commit | 38899f708923d6a7e1edd011af2ba70f505bb4c9 (patch) | |
| tree | 3be05ddba540cd397b490f94ff329c4c0c0d31de /src/main/java/com/google/devtools/build/lib/rules/android | |
| parent | 008e5f8d80dcf2c1eb8c152684d222c95a402d19 (diff) | |
Return Java providers only once
through JavaInfo, instead of returning them also through ConfiguredTarget. Since these providers can not be found in ConfiguredTarget anymore they have to be retrieved from JavaInfo instead.
RELNOTES: None.
PiperOrigin-RevId: 206585413
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android')
3 files changed, 3 insertions, 3 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 43054246af..b8cbcda8d2 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(builder, javaInfoBuilder, genClassJar, genSourceJar); + javaCommon.addGenJarsProvider(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 1bbb51ec8f..d84c653ed5 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(builder, javaInfoBuilder, genClassJar, genSourceJar); + javaCommon.addGenJarsProvider(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 c954a9fa9e..d5214126b2 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 = - base.getProvider(JavaCompilationInfoProvider.class); + JavaInfo.getProvider(JavaCompilationInfoProvider.class, base); if (compilationInfo == null || compilationInfo.getBootClasspath().isEmpty()) { return ImmutableList.of( ruleContext |