commit dba245e24b4fb10953c557b8d9a8b5bbb0ad9609
author hvd <hvd@google.com> Wed Jan 19 01:39:17 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Jan 19 01:40:22 2022 -0800
tree 20bf6299aef3e7db1a16bdd439e5853f13e0de56
parent fbc5d5392cef83b001f4c045bea6f8c9de984211

Convert JavaCompilationArgsProvider to JavaCompilationInfoProvider for Starlark java_binary

PiperOrigin-RevId: 422754563

src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
index 1af02db..1cfa490 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaStarlarkCommon.java
@@ -343,8 +343,11 @@
       builder.addProvider(JavaCompilationInfoProvider.class, javaInfo.getCompilationInfoProvider());
     } else if (javaInfo.getProvider(JavaCompilationArgsProvider.class) != null) {
       builder.addProvider(
-          JavaCompilationArgsProvider.class,
-          javaInfo.getProvider(JavaCompilationArgsProvider.class));
+          JavaCompilationInfoProvider.class,
+          new JavaCompilationInfoProvider.Builder()
+              .setRuntimeClasspath(
+                  javaInfo.getProvider(JavaCompilationArgsProvider.class).getRuntimeJars())
+              .build());
     }
     if (javaInfo.getProvider(JavaGenJarsProvider.class) != null) {
       builder.addProvider(JavaGenJarsProvider.class, javaInfo.getGenJarsProvider());