From 49da2757cd04850b4667504e7e9bd595aad25c94 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 5 Jun 2018 17:22:57 -0700
Subject: [PATCH] Add kotlin stdlib to javac classpath

Java modules that have .kt sources may also use kotlin stdlib types
in their .java sources.

Bug: 78245848
Test: m checkbuild
Change-Id: I064cb76b8a641ad92d648febaa400bc01549a9c5
---
 java/java.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/java/java.go b/java/java.go
index e5719135e..1fefcabeb 100644
--- a/java/java.go
+++ b/java/java.go
@@ -928,6 +928,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 		}
 
 		// Make javac rule depend on the kotlinc rule
+		flags.classpath = append(flags.classpath, deps.kotlinStdlib...)
 		flags.classpath = append(flags.classpath, kotlinJar)
 
 		// Jar kotlin classes into the final jar after javac