diff options
| author | 2019-10-29 21:08:33 +0000 | |
|---|---|---|
| committer | 2019-10-29 21:08:33 +0000 | |
| commit | ec90e44ce786c3a560e7ab7c0666714c8c744cb4 (patch) | |
| tree | c416d66535f1fb4673a9ac4c1a8ade27a97699e2 /java/kotlin.go | |
| parent | 657615e0d6a6b60a77b9efe766eb9e60bc3b94e1 (diff) | |
| parent | 6cef481ee7c27ee08b9da3ace059860851cd8b69 (diff) | |
Merge changes Icfd32d0a,Icc9ff4d4,Ieee07502,I559eeb1f,Iaf2a6f6d, ...
* changes:
Use java language 1.9 for sdk_version: "current"
Remove special case for sdk_version: "none"
Use system modules for turbine
Make javaVersion an enum
Move TestConfig sdk versions forward
Split java 8 and 9 classpaths in TestClasspath
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()) |