tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Cole Faust 2022-07-08 05:18:22 +00:00 committed by Gerrit Code Review
commit 01365d5890
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
java/base.go
View file

@ -1072,6 +1072,13 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) {
kotlincFlags := j.properties.Kotlincflags kotlincFlags := j.properties.Kotlincflags
CheckKotlincFlags(ctx, 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 // Workaround for KT-46512
kotlincFlags = append(kotlincFlags, "-Xsam-conversions=class") kotlincFlags = append(kotlincFlags, "-Xsam-conversions=class")