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
diff --git a/java/builder.go b/java/builder.go
index 48fba23..ff618d8 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -214,11 +214,15 @@
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,