openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove uses of buildDir from java/kotlin_test.go" am: 5916fe6856 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1649802

Change-Id: I5c1277d53b3708c39430632d0465535247ea1a8a
This commit is contained in:
Paul Duffin 2021-03-24 08:29:44 +00:00 committed by Automerger Merge Worker
parent 372c1fc7f4 5916fe6856
commit 2d074dd87d
1 changed files with 11 additions and 8 deletions
Show Stats 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{
"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 +