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

Commit 08b0a1cd authored by Colin Cross's avatar Colin Cross
Browse files

Add missing dependency on compose plugin in kapt rules 

The kapt rule uses kotlincFlags but was not using kotlincDeps,
causing the rule to get the -Xplugin argument on the compose
compiler plugin jar, but not have a dependency on it.

Bug: 231222079
Test: TestKotlinCompose
Change-Id: I4c2cf30fb7d8cad4eededa29f67f4ffd459caa41
parent 184a6b87

java/kotlin.go

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ func kotlinKapt(ctx android.ModuleContext, srcJarOutputFile, resJarOutputFile an 


	var deps android.Paths

	deps = append(deps, flags.kotlincClasspath...)

	deps = append(deps, flags.kotlincDeps...)

	deps = append(deps, srcJars...)

	deps = append(deps, flags.processorPath...)

	deps = append(deps, commonSrcFiles...)

java/kotlin_test.go

+8 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ func TestKotlinCompose(t *testing.T) { 
		java_library {

			name: "withcompose",

			srcs: ["a.kt"],

			plugins: ["plugin"],

			static_libs: ["androidx.compose.runtime_runtime"],

		}
@@ -332,6 +333,10 @@ func TestKotlinCompose(t *testing.T) { 
			name: "nocompose",

			srcs: ["a.kt"],

		}



		java_plugin {

			name: "plugin",

		}

	`)



	buildOS := result.Config.BuildOS.String()
@@ -346,6 +351,9 @@ func TestKotlinCompose(t *testing.T) { 
	android.AssertStringDoesContain(t, "missing compose compiler plugin",

		withCompose.VariablesForTestsRelativeToTop()["kotlincFlags"], "-Xplugin="+composeCompiler.String())



	android.AssertStringListContains(t, "missing kapt compose compiler dependency",

		withCompose.Rule("kapt").Implicits.Strings(), composeCompiler.String())



	android.AssertStringListDoesNotContain(t, "unexpected compose compiler dependency",

		noCompose.Rule("kotlinc").Implicits.Strings(), composeCompiler.String())