StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add kotlin stdlib to javac classpath"

Browse Source 
am: dd0b4e06f5

Change-Id: Idac77630835658f7b2bcfa6175073b213e8693a4
This commit is contained in:
Colin Cross
2018-06-05 22:53:16 -07:00
committed by android-build-merger
parent ca96388e60 dd0b4e06f5
commit 3d88f297d2
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java.go
View File

@@ -928,6 +928,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
} }
// Make javac rule depend on the kotlinc rule // Make javac rule depend on the kotlinc rule
flags.classpath = append(flags.classpath, deps.kotlinStdlib...)
flags.classpath = append(flags.classpath, kotlinJar) flags.classpath = append(flags.classpath, kotlinJar)
// Jar kotlin classes into the final jar after javac // Jar kotlin classes into the final jar after javac