diff options
| author | Colin Cross <ccross@android.com> | 2019-10-28 11:37:20 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-10-28 14:55:03 -0700 |
| commit | 1e7438524b7e28c5f58c6ab380a53777c221dc70 (patch) | |
| tree | de9725a147ef6cfc138689de3a921c09e70dda3b /java/kotlin.go | |
| parent | 74362a4d5e116a521155513db3e6aa2b1a7dff22 (diff) | |
Make javaVersion an enum
Remove the hardcoded checks against "1.9" by making javaVersion
an enum and implementing javaVersion.usesJavaModules().
Test: TestClasspath
Change-Id: I559eeb1f45880bb8177269c6d977ee4dfbadce57
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 83069072c..f8ae229de 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -141,8 +141,8 @@ func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath, } encodedJavacFlags := kaptEncodeFlags([][2]string{ - {"-source", flags.javaVersion}, - {"-target", flags.javaVersion}, + {"-source", flags.javaVersion.String()}, + {"-target", flags.javaVersion.String()}, }) kotlinName := filepath.Join(ctx.ModuleDir(), ctx.ModuleSubDir(), ctx.ModuleName()) |