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

Commit a7b916b5 authored by Spandan Das's avatar Spandan Das Committed by Gerrit Code Review
Browse files

Merge "Use -language-version 1.9 in the kotlinKythe build rule" into main

parents c5d2456d 3d6c6d9c
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -50,4 +50,11 @@ func init() {
	}, " "))

	pctx.StaticVariable("KotlincGlobalFlags", strings.Join([]string{}, " "))
	// Use KotlincKytheGlobalFlags to prevent kotlinc version skew issues between android and
	// g3 kythe indexers.
	// This is necessary because there might be instances of kotlin code in android
	// platform that are not fully compatible with the kotlinc used in g3 kythe indexers.
	// e.g. uninitialized variables are a warning in 1.*, but an error in 2.*
	// https://github.com/JetBrains/kotlin/blob/master/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt#L748
	pctx.StaticVariable("KotlincKytheGlobalFlags", strings.Join([]string{"-language-version 1.9"}, " "))
}
+2 −3
Original line number Diff line number Diff line
@@ -65,8 +65,6 @@ var kotlinc = pctx.AndroidRemoteStaticRule("kotlinc", android.RemoteRuleSupports
	"headerClassesDir", "headerJar", "kotlinJvmTarget", "kotlinBuildFile", "emptyDir", "name")

var kotlinKytheExtract = pctx.AndroidStaticRule("kotlinKythe",
	// TODO (b/265428637): To prevent kotlinc version skew between android builds and internal kotlin indexers (g3), consider embedding the kotlinc used by android into the kzip file.
	// This has an impact on .kzip sizes, so defer that for now.
	blueprint.RuleParams{
		Command: `rm -rf "$srcJarDir" && mkdir -p "$srcJarDir" && ` +
			`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" -f "*.kt" $srcJars && ` +
@@ -76,7 +74,8 @@ var kotlinKytheExtract = pctx.AndroidStaticRule("kotlinKythe",
			// Skip header jars, those should not have an effect on kythe results.
			` --args '${config.KotlincGlobalFlags} ` +
			` ${config.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} ` +
			` $kotlincFlags -jvm-target $kotlinJvmTarget'`,
			` $kotlincFlags -jvm-target $kotlinJvmTarget ` +
			`${config.KotlincKytheGlobalFlags}'`,
		CommandDeps: []string{
			"${config.KotlinKytheExtractor}",
			"${config.ZipSyncCmd}",