From 9bc4343beae07ec81a0f905994e6467d906b0f78 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 15 Dec 2017 20:20:39 -0800
Subject: 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
---
 java/builder.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'java/builder.go')

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,
-- 
cgit v1.2.3-59-g8ed1b