From e3d26bf9789665af084233c4efe29fb82b852fad Mon Sep 17 00:00:00 2001 From: Przemyslaw Szczepaniak Date: Mon, 5 Mar 2018 16:06:42 +0000 Subject: [PATCH] Pass bootclasspath to kotlinc Lack of bootclasspath causes lack of libcore classes when compiling code that would run on a device. Bug: 73281388 Test: make hidl-doc Change-Id: I2172740c4e318a7e24d0a40d967ccc91b7226338 --- java/java.go | 1 + 1 file changed, 1 insertion(+) 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...)