Merge "Pass bootclasspath to kotlinc" am: fd4795f58c

am: ce7d3a068d

Change-Id: I317dfdc09ebf120da9d1ec5f9ae552d36927e714
This commit is contained in:
Przemyslaw Szczepaniak
2018-03-06 19:18:32 +00:00
committed by android-build-merger

View File

@@ -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...)