From 95db4159d6fc39de2f2cf5a0bf23bde807e3d6ec Mon Sep 17 00:00:00 2001
From: cushon <cushon@google.com>
Date: Tue, 24 Apr 2018 17:11:52 -0700
Subject: Use JavaRuleOutputJarsProvider to collect non-transitive runtime jars

PiperOrigin-RevId: 194170571
---
 .../build/lib/rules/android/DexArchiveAspect.java         | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/google/devtools/build/lib')

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 296ce6dc46..c2b1a488ef 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
@@ -13,6 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.rules.android;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType.UNQUOTED;
 import static com.google.devtools.build.lib.packages.Attribute.attr;
 import static com.google.devtools.build.lib.packages.BuildType.LABEL;
@@ -59,6 +60,8 @@ import com.google.devtools.build.lib.rules.java.JavaCommon;
 import com.google.devtools.build.lib.rules.java.JavaCompilationArgsProvider;
 import com.google.devtools.build.lib.rules.java.JavaCompilationInfoProvider;
 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.proto.JavaProtoAspectCommon;
 import com.google.devtools.build.lib.rules.java.proto.JavaProtoLibraryAspectProvider;
 import com.google.devtools.build.lib.rules.proto.ProtoLangToolchainProvider;
@@ -270,11 +273,15 @@ public final class DexArchiveAspect extends NativeAspectClass implements Configu
       ConfiguredTarget base, RuleContext ruleContext) {
     if (isProtoLibrary(ruleContext)) {
       if (!ruleContext.getPrerequisites("srcs", Mode.TARGET).isEmpty()) {
-        JavaCompilationArgsProvider javaCompilationArgsProvider =
+        JavaRuleOutputJarsProvider outputJarsProvider =
             WrappingProvider.Helper.getWrappedProvider(
-                base, JavaProtoLibraryAspectProvider.class, JavaCompilationArgsProvider.class);
-        if (javaCompilationArgsProvider != null) {
-          return javaCompilationArgsProvider.getJavaCompilationArgs().getRuntimeJars();
+                base, JavaProtoLibraryAspectProvider.class, JavaRuleOutputJarsProvider.class);
+        if (outputJarsProvider != null) {
+          return outputJarsProvider
+              .getOutputJars()
+              .stream()
+              .map(OutputJar::getClassJar)
+              .collect(toImmutableList());
         }
       }
     } else {
-- 
cgit v1.2.3