StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update flags passed to kotlinc" am: fe027e0ec9 am: 8861bbe281

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

Change-Id: Icb07e2343e68abd572ccf87a336bb6635c05bbff
This commit is contained in:
Treehugger Robot
2021-05-18 23:17:15 +00:00
committed by Automerger Merge Worker
parent 33e1a22aed 8861bbe281
commit 929af709eb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/base.go
View File

@@ -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