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

Commit b148a493 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove uses of buildDir from java/kotlin_test.go 

Remove any uses, either direct (or indirect via testJavaConfig or
similar methods), of the package level buildDir variable from this
file.

Bug: 182885307
Test: m nothing
Change-Id: Id1d449d55fe992ebc3d7bad38a76bb1652844f52
parent 414ea5eb

java/kotlin_test.go

+11 −8
Original line number Diff line number Diff line
@@ -176,19 +176,22 @@ func TestKapt(t *testing.T) { 
		env := map[string]string{

			"RUN_ERROR_PRONE": "true",

		}

		config := testConfig(env, bp, nil)

		ctx, _ := testJavaWithConfig(t, config)



		result := android.GroupFixturePreparers(

			PrepareForTestWithJavaDefaultModules,

			android.FixtureMergeEnv(env),

		).RunTestWithBp(t, bp)



		buildOS := android.BuildOs.String()



		kapt := ctx.ModuleForTests("foo", "android_common").Rule("kapt")

		kapt := result.ModuleForTests("foo", "android_common").Rule("kapt")

		//kotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc")

		javac := ctx.ModuleForTests("foo", "android_common").Description("javac")

		errorprone := ctx.ModuleForTests("foo", "android_common").Description("errorprone")

		javac := result.ModuleForTests("foo", "android_common").Description("javac")

		errorprone := result.ModuleForTests("foo", "android_common").Description("errorprone")



		bar := ctx.ModuleForTests("bar", buildOS+"_common").Description("javac").Output.String()

		baz := ctx.ModuleForTests("baz", buildOS+"_common").Description("javac").Output.String()

		myCheck := ctx.ModuleForTests("my_check", buildOS+"_common").Description("javac").Output.String()

		bar := result.ModuleForTests("bar", buildOS+"_common").Description("javac").Output.String()

		baz := result.ModuleForTests("baz", buildOS+"_common").Description("javac").Output.String()

		myCheck := result.ModuleForTests("my_check", buildOS+"_common").Description("javac").Output.String()



		// Test that the errorprone plugins are not passed to kapt

		expectedProcessorPath := "-P plugin:org.jetbrains.kotlin.kapt3:apclasspath=" + bar +