StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove uses of buildDir from java/kotlin_test.go

Browse Source 
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
This commit is contained in:
Paul Duffin
2021-03-22 17:31:52 +00:00
parent 414ea5eb73
commit b148a49319
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/kotlin_test.go
View File

@@ -176,19 +176,22 @@ func TestKapt(t *testing.T) {
env := map[string]string{ env := map[string]string{
"RUN_ERROR_PRONE": "true", "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() 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") //kotlinc := ctx.ModuleForTests("foo", "android_common").Rule("kotlinc")
javac := ctx.ModuleForTests("foo", "android_common").Description("javac") javac := result.ModuleForTests("foo", "android_common").Description("javac")
errorprone := ctx.ModuleForTests("foo", "android_common").Description("errorprone") errorprone := result.ModuleForTests("foo", "android_common").Description("errorprone")
bar := ctx.ModuleForTests("bar", buildOS+"_common").Description("javac").Output.String() bar := result.ModuleForTests("bar", buildOS+"_common").Description("javac").Output.String()
baz := ctx.ModuleForTests("baz", buildOS+"_common").Description("javac").Output.String() baz := result.ModuleForTests("baz", buildOS+"_common").Description("javac").Output.String()
myCheck := ctx.ModuleForTests("my_check", 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 // Test that the errorprone plugins are not passed to kapt
expectedProcessorPath := "-P plugin:org.jetbrains.kotlin.kapt3:apclasspath=" + bar + expectedProcessorPath := "-P plugin:org.jetbrains.kotlin.kapt3:apclasspath=" + bar +