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 9d94744d65f292..46cefed6dfc1e9 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
@@ -371,11 +371,13 @@ public JavaInfo toJavaBinaryInfo(JavaInfo javaInfo, StarlarkThread thread) throw
     if (javaInfo.getProvider(JavaCompilationInfoProvider.class) != null) {
       builder.addProvider(JavaCompilationInfoProvider.class, javaInfo.getCompilationInfoProvider());
     } else if (javaInfo.getProvider(JavaCompilationArgsProvider.class) != null) {
+      JavaCompilationArgsProvider compilationArgsProvider =
+          javaInfo.getProvider(JavaCompilationArgsProvider.class);
       builder.addProvider(
           JavaCompilationInfoProvider.class,
           new JavaCompilationInfoProvider.Builder()
-              .setRuntimeClasspath(
-                  javaInfo.getProvider(JavaCompilationArgsProvider.class).getRuntimeJars())
+              .setCompilationClasspath(compilationArgsProvider.getTransitiveCompileTimeJars())
+              .setRuntimeClasspath(compilationArgsProvider.getRuntimeJars())
               .build());
     }
     if (javaInfo.getProvider(JavaGenJarsProvider.class) != null) {