aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-06-10 19:07:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-06-10 19:07:07 +0000
commitba27e13355e235cea24c0f16f3f5bb23e6dfd88a (patch)
tree261f5531c1f3f98ff2f91af6e45e4641bcdc222e
parent2a9b6508c2a18fa367e9b641fea6a95d2287132b (diff)
parent19b1742614570b0debcdd13238917126924d321c (diff)
downloadbuild_soong-ba27e13355e235cea24c0f16f3f5bb23e6dfd88a.tar.gz
build_soong-ba27e13355e235cea24c0f16f3f5bb23e6dfd88a.tar.bz2
build_soong-ba27e13355e235cea24c0f16f3f5bb23e6dfd88a.zip
Snap for 4832339 from 19b1742614570b0debcdd13238917126924d321c to pi-release
Change-Id: Ie8d65ddd251352c57b4e2ee7a151693f218567dc
-rw-r--r--java/java.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go
index 619ae754..ddfb09a4 100644
--- a/java/java.go
+++ b/java/java.go
@@ -806,6 +806,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
}
// Make javac rule depend on the kotlinc rule
+ flags.classpath = append(flags.classpath, deps.kotlinStdlib...)
flags.classpath = append(flags.classpath, kotlinJar)
// Jar kotlin classes into the final jar after javac
jars = append(jars, kotlinJar)