diff options
| author | 2019-05-21 18:11:59 +0000 | |
|---|---|---|
| committer | 2019-05-21 18:11:59 +0000 | |
| commit | 6be6c2e4c53748263222aae44e6b3ecedf885927 (patch) | |
| tree | 40004e1cc466b53b42b037aea4638c74a9784c9e /java/java.go | |
| parent | 8a7469a0d7d390b76ede3bd830065575571502d5 (diff) | |
| parent | 0b03d9701b532836fb72392cba46f676796f4c07 (diff) | |
Merge "Add kotlin-stdlib-jdk8 when using Kotlin"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 060a00700..44830839d 100644 --- a/java/java.go +++ b/java/java.go @@ -517,7 +517,8 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { if j.hasSrcExt(".kt") { // TODO(ccross): move this to a mutator pass that can tell if generated sources contain // Kotlin files - ctx.AddVariationDependencies(nil, kotlinStdlibTag, "kotlin-stdlib") + ctx.AddVariationDependencies(nil, kotlinStdlibTag, + "kotlin-stdlib", "kotlin-stdlib-jdk7", "kotlin-stdlib-jdk8") if len(j.properties.Plugins) > 0 { ctx.AddVariationDependencies(nil, kotlinAnnotationsTag, "kotlin-annotations") } @@ -793,7 +794,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps { deps.staticResourceJars = append(deps.staticResourceJars, dep.(*AndroidApp).exportPackage) } case kotlinStdlibTag: - deps.kotlinStdlib = dep.HeaderJars() + deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...) case kotlinAnnotationsTag: deps.kotlinAnnotations = dep.HeaderJars() } |