diff options
| author | 2021-04-02 15:39:13 +0000 | |
|---|---|---|
| committer | 2021-04-02 15:39:13 +0000 | |
| commit | 2fbc234fd63b20f054739723d8921ccee7906a5f (patch) | |
| tree | 309c07098159c0cf0ca1e073a34bdf11a2824fc9 /java/kotlin.go | |
| parent | cb05715e9ef54e8d7a8cecb5dba5df8facf8a083 (diff) | |
| parent | d47f4ac8286ab6d810dacb73a953b6b8db95071c (diff) | |
Merge "Silence kotlinc JDK9 warnings"
Diffstat (limited to 'java/kotlin.go')
| -rw-r--r-- | java/kotlin.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/java/kotlin.go b/java/kotlin.go index 2960f819d..3a6fc0f48 100644 --- a/java/kotlin.go +++ b/java/kotlin.go @@ -34,8 +34,9 @@ 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.JavacHeapFlags} $kotlincFlags ` + - `-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile -kotlin-home $emptyDir && ` + + `${config.KotlincCmd} ${config.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} ` + + `$kotlincFlags -jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile ` + + `-kotlin-home $emptyDir && ` + `${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir && ` + `rm -rf "$srcJarDir"`, CommandDeps: []string{ @@ -123,8 +124,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.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} $kotlincFlags ` + - `-Xplugin=${config.KotlinKaptJar} ` + + `${config.KotlincCmd} ${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 ` + `-P plugin:org.jetbrains.kotlin.kapt3:stubs=$kaptDir/stubs ` + |