diff options
| author | Colin Cross <ccross@android.com> | 2018-06-05 17:22:57 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-06-05 23:18:50 -0700 |
| commit | 19b1742614570b0debcdd13238917126924d321c (patch) | |
| tree | 261f5531c1f3f98ff2f91af6e45e4641bcdc222e | |
| parent | 9ccbba0200cf56cc6b1b09bc45fa2efb1ea9a411 (diff) | |
| download | build_soong-19b1742614570b0debcdd13238917126924d321c.tar.gz build_soong-19b1742614570b0debcdd13238917126924d321c.tar.bz2 build_soong-19b1742614570b0debcdd13238917126924d321c.zip | |
Add kotlin stdlib to javac classpath
Java modules that have .kt sources may also use kotlin stdlib types
in their .java sources.
Bug: 78245848
Test: m checkbuild
Change-Id: I064cb76b8a641ad92d648febaa400bc01549a9c5
Merged-In: I064cb76b8a641ad92d648febaa400bc01549a9c5
(cherry picked from commit 49da2757cd04850b4667504e7e9bd595aad25c94)
| -rw-r--r-- | java/java.go | 1 |
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) |