diff options
| author | 2019-01-17 15:42:52 -0800 | |
|---|---|---|
| committer | 2019-01-22 21:47:19 +0000 | |
| commit | afbb1734f6fe8073885961578e9312e16826a2e8 (patch) | |
| tree | 1cb607eccd00db64b72aa306c7b1649d25457c31 /java/config/kotlin.go | |
| parent | 21fc9bbe198caf9736bb9dc0f5701e8bfd56de40 (diff) | |
Pass annotation processors to kotlinc
Enable the kotlin-annotation-processing plugin and pass annotation
processors to it.
Bug: 122251693
Test: m checkbuild
Test: TestKapt in kotlin_test.go
Change-Id: I841df454beaaa7edd263eea714ca0d958a03c9de
Diffstat (limited to 'java/config/kotlin.go')
| -rw-r--r-- | java/config/kotlin.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/config/kotlin.go b/java/config/kotlin.go index 432840e55..2af7b3c3a 100644 --- a/java/config/kotlin.go +++ b/java/config/kotlin.go @@ -14,6 +14,8 @@ package config +import "strings" + var ( KotlinStdlibJar = "external/kotlinc/lib/kotlin-stdlib.jar" KotlincIllegalFlags = []string{ @@ -25,5 +27,14 @@ var ( func init() { pctx.SourcePathVariable("KotlincCmd", "external/kotlinc/bin/kotlinc") pctx.SourcePathVariable("KotlinCompilerJar", "external/kotlinc/lib/kotlin-compiler.jar") + pctx.SourcePathVariable("KotlinKaptJar", "external/kotlinc/lib/kotlin-annotation-processing.jar") pctx.SourcePathVariable("KotlinStdlibJar", KotlinStdlibJar) + + // These flags silence "Illegal reflective access" warnings when running kotlinc in OpenJDK9 + pctx.StaticVariable("KotlincSuppressJDK9Warnings", strings.Join([]string{ + "-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", + "-J--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED", + }, " ")) } |