Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c02a8e3c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec am:... 

Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec am: ee5858c4 am: 4b85795a am: 2edfe874

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: I94202436b8ec9c600addc4f6a6b7214618b5b11c
parents 453f03d0 2edfe874

java/config/kotlin.go

+5 −0
Original line number Diff line number Diff line
@@ -47,4 +47,9 @@ func init() { 
	pctx.StaticVariable("KotlincSuppressJDK9Warnings", strings.Join([]string{

		"-J--add-opens=java.base/java.util=ALL-UNNAMED", // https://youtrack.jetbrains.com/issue/KT-43704

	}, " "))



	pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{

		// b/222162908: prevent kotlinc from reading /tmp/build.txt

		"-Didea.plugins.compatible.build=999.SNAPSHOT",

	}, " "))

}

java/kotlin.go

+4 −2
Original line number Diff line number Diff line
@@ -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 ` +