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

Commit 0f40a752 authored by Colin Cross's avatar Colin Cross
Browse files

Move kotlinc-build.xml out of classes directory 

kotlinc-build.xml was ending up in the final jar because it was
being created in the directory where the classes were written.
Rename the variable containing the classes directory from outDir
to classesDir to discourage putting other files in there, and
move kotlinc-build.xml up a directory.

Bug: 114524493
Test: m checkbuild
Change-Id: Id2e2af0a6543499bd25b8fbd642bc59b14bd241f
parent 0903f90e

java/builder.go

+11 −10
Original line number Diff line number Diff line
@@ -61,12 +61,12 @@ var ( 


	kotlinc = pctx.AndroidGomaStaticRule("kotlinc",

		blueprint.RuleParams{

			Command: `rm -rf "$outDir" "$srcJarDir" && mkdir -p "$outDir" "$srcJarDir" && ` +

			Command: `rm -rf "$classesDir" "$srcJarDir" "$kotlinBuildFile" && mkdir -p "$classesDir" "$srcJarDir" && ` +

				`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +

				`${config.GenKotlinBuildFileCmd} $classpath $outDir $out.rsp $srcJarDir/list > $outDir/kotlinc-build.xml &&` +

				`${config.GenKotlinBuildFileCmd} $classpath $classesDir $out.rsp $srcJarDir/list > $kotlinBuildFile &&` +

				`${config.KotlincCmd} $kotlincFlags ` +

				`-jvm-target $kotlinJvmTarget -Xbuild-file=$outDir/kotlinc-build.xml && ` +

				`${config.SoongZipCmd} -jar -o $out -C $outDir -D $outDir`,

				`-jvm-target $kotlinJvmTarget -Xbuild-file=$kotlinBuildFile && ` +

				`${config.SoongZipCmd} -jar -o $out -C $classesDir -D $classesDir`,

			CommandDeps: []string{

				"${config.KotlincCmd}",

				"${config.KotlinCompilerJar}",
@@ -77,7 +77,7 @@ var ( 
			Rspfile:        "$out.rsp",

			RspfileContent: `$in`,

		},

		"kotlincFlags", "classpath", "srcJars", "srcJarDir", "outDir", "kotlinJvmTarget")

		"kotlincFlags", "classpath", "srcJars", "srcJarDir", "classesDir", "kotlinJvmTarget", "kotlinBuildFile")



	turbine = pctx.AndroidStaticRule("turbine",

		blueprint.RuleParams{
@@ -176,8 +176,9 @@ func TransformKotlinToClasses(ctx android.ModuleContext, outputFile android.Writ 
			"classpath":       flags.kotlincClasspath.FormJavaClassPath("-classpath"),

			"kotlincFlags":    flags.kotlincFlags,

			"srcJars":         strings.Join(srcJars.Strings(), " "),

			"outDir":       android.PathForModuleOut(ctx, "kotlinc", "classes").String(),

			"classesDir":      android.PathForModuleOut(ctx, "kotlinc", "classes").String(),

			"srcJarDir":       android.PathForModuleOut(ctx, "kotlinc", "srcJars").String(),

			"kotlinBuildFile": android.PathForModuleOut(ctx, "kotlinc-build.xml").String(),

			// http://b/69160377 kotlinc only supports -jvm-target 1.6 and 1.8

			"kotlinJvmTarget": "1.8",

		},