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

Commit 7631bdf1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Add -Xjvm-defaults=all to kotlin compilations""

parents 6b773a97 b0ef8b16

java/base.go

+0 −7
Original line number Diff line number Diff line
@@ -1072,13 +1072,6 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		kotlincFlags := j.properties.Kotlincflags

		CheckKotlincFlags(ctx, kotlincFlags)



		// This is needed for code that depends on libraries that use @JvmDefault

		// -Xjvm-default=all will be the default in a future version of kotlin

		// according to https://blog.jetbrains.com/kotlin/2020/07/kotlin-1-4-m3-generating-default-methods-in-interfaces/

		if flags.javaVersion >= JAVA_VERSION_8 {

			kotlincFlags = append(kotlincFlags, "-Xjvm-default=all")

		}



		// Workaround for KT-46512

		kotlincFlags = append(kotlincFlags, "-Xsam-conversions=class")