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

Commit 8861bbe2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update flags passed to kotlinc" am: fe027e0e 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1709808

Change-Id: I72ec5354f6dd13b0b67921f19a8f92f60eecfba5
parents 376c9b5f fe027e0e

java/base.go

+2 −2
Original line number Diff line number Diff line
@@ -889,8 +889,8 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		kotlincFlags := j.properties.Kotlincflags

		CheckKotlincFlags(ctx, kotlincFlags)



		// Dogfood the JVM_IR backend.

		kotlincFlags = append(kotlincFlags, "-Xuse-ir")

		// Workaround for KT-46512

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



		// If there are kotlin files, compile them first but pass all the kotlin and java files

		// kotlinc will use the java files to resolve types referenced by the kotlin files, but