diff options
| author | 2022-03-16 18:06:48 -0700 | |
|---|---|---|
| committer | 2022-03-25 10:28:50 -0700 | |
| commit | f61766e98797a00d06071e5120d0b67aa3014ebd (patch) | |
| tree | 417ae4e726b0e5ddd6883fd74ba5f2b44ab27bd0 /java/java_test.go | |
| parent | 411647e8f45750e54276abce8a60aebbd7058e4e (diff) | |
Use turbine instead of kapt for kotlin annotation processors
Follow Bazel by using turbine instead of kapt to run annotation
processors. This still requires using kapt to generate java stubs
of kotlin soruces, then uses turbine to run annotation processors
on the java stubs and any java sources to generate sources and
resources, and passes the annotation processor generated sources
to kotlinc and javac.
Bug: 225013372
Test: m checkbuild
Test: TestKapt
Change-Id: I9c6fc496a9fba64658bb062538bc5f7b9478b07a
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java_test.go b/java/java_test.go index f095c5e48..4c9382413 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -973,7 +973,7 @@ func TestTurbine(t *testing.T) { fooHeaderJar := filepath.Join("out", "soong", ".intermediates", "foo", "android_common", "turbine-combined", "foo.jar") barTurbineJar := filepath.Join("out", "soong", ".intermediates", "bar", "android_common", "turbine", "bar.jar") - android.AssertStringDoesContain(t, "bar turbine classpath", barTurbine.Args["classpath"], fooHeaderJar) + android.AssertStringDoesContain(t, "bar turbine classpath", barTurbine.Args["turbineFlags"], fooHeaderJar) android.AssertStringDoesContain(t, "bar javac classpath", barJavac.Args["classpath"], fooHeaderJar) android.AssertPathsRelativeToTopEquals(t, "bar turbine combineJar", []string{barTurbineJar, fooHeaderJar}, barTurbineCombined.Inputs) android.AssertStringDoesContain(t, "baz javac classpath", bazJavac.Args["classpath"], "prebuilts/sdk/14/public/android.jar") |