diff options
| author | Colin Cross <ccross@android.com> | 2022-03-17 12:01:27 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2022-03-18 20:48:51 +0000 |
| commit | c2d504873f19e6f1d648878d21d3dd17f5742b05 (patch) | |
| tree | 7dfc1b1291e4c189a285079cb05f7da928c0934a /java/kotlin.go | |
| parent | 3f57c6a2c89a73bc554c10bb05f0c443fcb38081 (diff) | |
Prevent kotlinc from reading /tmp/build.txt
Pass -Didea.plugins.compatible.build=999.SNAPSHOT to kotlinc and kapt
to prevent it from reading /tmp/build.txt and failing with an obscure
exception:
exception: java.lang.ExceptionInInitializerError
at com.intellij.openapi.util.BuildNumber.currentVersion(BuildNumber.java:297)
...
Bug: 222162908
Test: m metalava with /tmp/build.txt present
Change-Id: I5faced4a2e94561ce3aa37bfaacf5bd7d988a4f0
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index e4f1bc198..3e5cec04c 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -34,7 +34,8 @@ var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.RemoteRuleSupports `${config.GenKotlinBuildFileCmd} --classpath "$classpath" --name "$name"` + ` --out_dir "$classesDir" --srcs "$out.rsp" --srcs "$srcJarDir/list"` + ` $commonSrcFilesArg --out "$kotlinBuildFile" && ` + - `${config.KotlincCmd} ${config.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} ` + + `${config.KotlincCmd} ${config.KotlincGlobalFlags} ` + + `${config.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} ` + `$kotlincFlags -jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile ` + `-kotlin-home $emptyDir && ` + `${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir && ` + @@ -125,7 +126,8 @@ var kapt = pctx.AndroidRemoteStaticRule("kapt", android.RemoteRuleSupports{Goma: `${config.GenKotlinBuildFileCmd} --classpath "$classpath" --name "$name"` + ` --srcs "$out.rsp" --srcs "$srcJarDir/list"` + ` $commonSrcFilesArg --out "$kotlinBuildFile" && ` + - `${config.KotlincCmd} ${config.KaptSuppressJDK9Warnings} ${config.KotlincSuppressJDK9Warnings} ` + + `${config.KotlincCmd} ${config.KotlincGlobalFlags} ` + + `${config.KaptSuppressJDK9Warnings} ${config.KotlincSuppressJDK9Warnings} ` + `${config.JavacHeapFlags} $kotlincFlags -Xplugin=${config.KotlinKaptJar} ` + `-P plugin:org.jetbrains.kotlin.kapt3:sources=$kaptDir/sources ` + `-P plugin:org.jetbrains.kotlin.kapt3:classes=$kaptDir/classes ` + |