Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6be6c2e4 authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge "Add kotlin-stdlib-jdk8 when using Kotlin"

parents 8a7469a0 0b03d970

java/java.go

+3 −2
Original line number Diff line number Diff line
@@ -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()

			}

java/testing.go

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ func GatherRequiredDepsForTest() string { 
		"core.current.stubs",

		"core.platform.api.stubs",

		"kotlin-stdlib",

		"kotlin-stdlib-jdk7",

		"kotlin-stdlib-jdk8",

		"kotlin-annotations",

	}