From 19b1742614570b0debcdd13238917126924d321c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Tue, 5 Jun 2018 17:22:57 -0700
Subject: 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
Merged-In: I064cb76b8a641ad92d648febaa400bc01549a9c5
(cherry picked from commit 49da2757cd04850b4667504e7e9bd595aad25c94)
---
 java/java.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index 619ae7548..ddfb09a4f 100644
--- a/java/java.go
+++ b/java/java.go
@@ -806,6 +806,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
 		jars = append(jars, kotlinJar)
-- 
cgit v1.2.3-59-g8ed1b