Add missing dependencies on classpath jars for kotlinc

The kotlinc build rules were missing dependencies on the jars in
the classpath.

Test: TestKotlin in java_test.go
Change-Id: I56681785289f942b1070751b7dc5944e7a995b7f
This commit is contained in:
Colin Cross
2017-12-15 20:20:39 -08:00
parent 2555b259ad
commit 9bc4343bea
2 changed files with 41 additions and 19 deletions

View File

@@ -214,11 +214,15 @@ func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.Writ
inputs := append(android.Paths(nil), srcFiles...)
inputs = append(inputs, srcJars...)
var deps android.Paths
deps = append(deps, flags.kotlincClasspath...)
ctx.Build(pctx, android.BuildParams{
Rule: kotlinc,
Description: "kotlinc",
Output: outputFile,
Inputs: inputs,
Implicits: deps,
Args: map[string]string{
"classpath": flags.kotlincClasspath.FormJavaClassPath("-classpath"),
"kotlincFlags": flags.kotlincFlags,