diff options
author | elenairina <elenairina@google.com> | 2018-08-02 02:27:57 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-08-02 02:30:09 -0700 |
commit | 2987ba80eea24051d3834b8ee00a5397ddd262c5 (patch) | |
tree | 5f3afe62c18fc4c3570d6f104a99572a60b1be64 /src/main/java/com/google/devtools/build/lib/rules/java | |
parent | 932a745b662bd84546c81b99a99b4fd1a25c4377 (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: 207068520
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/JavaCommon.java | 6 |
1 files changed, 2 insertions, 4 deletions
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 e2768b27ff..8ce42f4b26 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 = dep.getProvider(JavaExportsProvider.class); + JavaExportsProvider exportsProvider = JavaInfo.getProvider(JavaExportsProvider.class, dep); if (exportsProvider != null) { builder.addTransitive(exportsProvider.getTransitiveExports()); @@ -687,9 +687,7 @@ public class JavaCommon { .add( InstrumentedFilesProvider.class, getInstrumentationFilesProvider(ruleContext, filesToBuild, instrumentationSpec)) - .add(JavaExportsProvider.class, exportsProvider) - .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, getFilesToCompile(classJar)) - .add(JavaCompilationInfoProvider.class, compilationInfoProvider); + .addOutputGroup(OutputGroupInfo.FILES_TO_COMPILE, getFilesToCompile(classJar)); javaInfoBuilder.addProvider(JavaExportsProvider.class, exportsProvider); javaInfoBuilder.addProvider(JavaCompilationInfoProvider.class, compilationInfoProvider); |