Merge "Dogfood the new IR Kotlin compiler backend."

2020-12-04 00:05:07 +00:00 · 2020-12-04 00:05:07 +00:00 · cf8b2ee16e
parent 8baa8b50a8 ad2bfda285
commit cf8b2ee16e
1 changed files with 3 additions and 0 deletions
--- a/java/java.go
+++ b/java/java.go
@ -1446,6 +1446,9 @@ 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")
+
 		// 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
 		// won't emit any classes for them.