summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Przemyslaw Szczepaniak <pszczepaniak@google.com> 2018-03-06 10:10:40 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-03-06 10:10:40 +0000
commitfd4795f58cdeff1245ebd68df5640a9221af9185 (patch)
tree322402e3fda0d9b4641451f55ba07e261cc7291c /java/java.go
parentf975865a12dd735b355fed6fc868f7c9e394f40f (diff)
parente3d26bf9789665af084233c4efe29fb82b852fad (diff)
Merge "Pass bootclasspath to kotlinc"
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index ae48bd658..3bd07df30 100644
--- a/java/java.go
+++ b/java/java.go
@@ -782,6 +782,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
kotlinSrcFiles = append(kotlinSrcFiles, uniqueSrcFiles...)
kotlinSrcFiles = append(kotlinSrcFiles, srcFiles.FilterByExt(".kt")...)
+ flags.kotlincClasspath = append(flags.kotlincClasspath, deps.bootClasspath...)
flags.kotlincClasspath = append(flags.kotlincClasspath, deps.kotlinStdlib...)
flags.kotlincClasspath = append(flags.kotlincClasspath, deps.classpath...)