tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add kotlin-stdlib-jdk8 when using Kotlin" am: 6be6c2e4c5

Browse source 
am: 10077730ed

Change-Id: I8199cfe2fa1ea8305774357b65115a288f3446d9
This commit is contained in:
Colin Cross 2019-05-21 15:43:23 -07:00 committed by android-build-merger
commit 28d8dc1392
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
java/java.go
View file

@ -517,7 +517,8 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
if j.hasSrcExt(".kt") { if j.hasSrcExt(".kt") {
// TODO(ccross): move this to a mutator pass that can tell if generated sources contain // TODO(ccross): move this to a mutator pass that can tell if generated sources contain
// Kotlin files // 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 { if len(j.properties.Plugins) > 0 {
ctx.AddVariationDependencies(nil, kotlinAnnotationsTag, "kotlin-annotations") 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) deps.staticResourceJars = append(deps.staticResourceJars, dep.(*AndroidApp).exportPackage)
} }
case kotlinStdlibTag: case kotlinStdlibTag:
deps.kotlinStdlib = dep.HeaderJars() deps.kotlinStdlib = append(deps.kotlinStdlib, dep.HeaderJars()...)
case kotlinAnnotationsTag: case kotlinAnnotationsTag:
deps.kotlinAnnotations = dep.HeaderJars() deps.kotlinAnnotations = dep.HeaderJars()
} }

2
java/testing.go
View file

@ -45,6 +45,8 @@ func GatherRequiredDepsForTest() string {
"core.current.stubs", "core.current.stubs",
"core.platform.api.stubs", "core.platform.api.stubs",
"kotlin-stdlib", "kotlin-stdlib",
"kotlin-stdlib-jdk7",
"kotlin-stdlib-jdk8",
"kotlin-annotations", "kotlin-annotations",
} }