diff options
| author | 2017-12-15 20:20:39 -0800 | |
|---|---|---|
| committer | 2017-12-16 06:05:38 +0000 | |
| commit | 9bc4343beae07ec81a0f905994e6467d906b0f78 (patch) | |
| tree | 7b8a0911fbb190463fd3cb083efaf4774d016120 /java/builder.go | |
| parent | 2555b259ad2b2c3ba337ac2deacfc6d5d092b326 (diff) | |
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
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/java/builder.go b/java/builder.go index 48fba2303..ff618d85a 100644 --- a/java/builder.go +++ b/java/builder.go @@ -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, |