Merge "Add kotlin stdlib to javac classpath" am: dd0b4e06f5

am: 3d88f297d2 Change-Id: I19d7dff450e69c25895c136382c53fb4849eab48
2018-06-06 01:25:29 -07:00
parent 7a9601ca8a 3d88f297d2
commit 498cb41438
1 changed files with 1 additions and 0 deletions
--- 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