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

Commit 3791b45f authored by Colin Cross's avatar Colin Cross
Browse files

Fix annotation processors in kotlin modules that generate resources 

The kapt rule was only keeping the generated sources, and not the
generated classes directory.  The generated classes directory will
contain resources generated by the annotation processor and needs
to be added to the final jar.

Test: m ApiFinder
Bug: 153485543
Change-Id: I89197d0afcb1eee011c01aa400f9977e66f43768
Merged-In: I89197d0afcb1eee011c01aa400f9977e66f43768
(cherry picked from commit 9ca38d22)
parent 1e28e3c6

java/java.go

+3 −1
Original line number Diff line number Diff line
@@ -1327,8 +1327,10 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { 
		if len(flags.processorPath) > 0 {

			// Use kapt for annotation processing

			kaptSrcJar := android.PathForModuleOut(ctx, "kapt", "kapt-sources.jar")

			kotlinKapt(ctx, kaptSrcJar, kotlinSrcFiles, srcJars, flags)

			kaptResJar := android.PathForModuleOut(ctx, "kapt", "kapt-res.jar")

			kotlinKapt(ctx, kaptSrcJar, kaptResJar, kotlinSrcFiles, srcJars, flags)

			srcJars = append(srcJars, kaptSrcJar)

			kotlinJars = append(kotlinJars, kaptResJar)

			// Disable annotation processing in javac, it's already been handled by kapt

			flags.processorPath = nil

			flags.processors = nil

java/kotlin.go

+13 −8
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ func kotlinCompile(ctx android.ModuleContext, outputFile android.WritablePath, 


var kapt = pctx.AndroidRemoteStaticRule("kapt", android.RemoteRuleSupports{Goma: true},

	blueprint.RuleParams{

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

		Command: `rm -rf "$srcJarDir" "$kotlinBuildFile" "$kaptDir" && ` +

			`mkdir -p "$srcJarDir" "$kaptDir/sources" "$kaptDir/classes" && ` +

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

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

			`${config.KotlincCmd} ${config.KotlincSuppressJDK9Warnings} ${config.JavacHeapFlags} $kotlincFlags ` +
@@ -105,6 +106,7 @@ var kapt = pctx.AndroidRemoteStaticRule("kapt", android.RemoteRuleSupports{Goma: 
			`$kaptProcessor ` +

			`-Xbuild-file=$kotlinBuildFile && ` +

			`${config.SoongZipCmd} -jar -o $out -C $kaptDir/sources -D $kaptDir/sources && ` +

			`${config.SoongZipCmd} -jar -o $classesJarOut -C $kaptDir/classes -D $kaptDir/classes && ` +

			`rm -rf "$srcJarDir"`,

		CommandDeps: []string{

			"${config.KotlincCmd}",
@@ -118,13 +120,14 @@ var kapt = pctx.AndroidRemoteStaticRule("kapt", android.RemoteRuleSupports{Goma: 
		RspfileContent: `$in`,

	},

	"kotlincFlags", "encodedJavacFlags", "kaptProcessorPath", "kaptProcessor",

	"classpath", "srcJars", "srcJarDir", "kaptDir", "kotlinJvmTarget", "kotlinBuildFile", "name")

	"classpath", "srcJars", "srcJarDir", "kaptDir", "kotlinJvmTarget", "kotlinBuildFile", "name",

	"classesJarOut")



// kotlinKapt performs Kotlin-compatible annotation processing.  It takes .kt and .java sources and srcjars, and runs

// annotation processors over all of them, producing a srcjar of generated code in outputFile.  The srcjar should be

// added as an additional input to kotlinc and javac rules, and the javac rule should have annotation processing

// disabled.

func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath,

func kotlinKapt(ctx android.ModuleContext, srcJarOutputFile, resJarOutputFile android.WritablePath,

	srcFiles, srcJars android.Paths,

	flags javaBuilderFlags) {
@@ -154,7 +157,8 @@ func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath, 
	ctx.Build(pctx, android.BuildParams{

		Rule:           kapt,

		Description:    "kapt",

		Output:      outputFile,

		Output:         srcJarOutputFile,

		ImplicitOutput: resJarOutputFile,

		Inputs:         srcFiles,

		Implicits:      deps,

		Args: map[string]string{
@@ -168,6 +172,7 @@ func kotlinKapt(ctx android.ModuleContext, outputFile android.WritablePath, 
			"kaptDir":           android.PathForModuleOut(ctx, "kapt/gen").String(),

			"encodedJavacFlags": encodedJavacFlags,

			"name":              kotlinName,

			"classesJarOut":     resJarOutputFile.String(),

		},

	})

}