diff options
| author | Colin Cross <ccross@android.com> | 2020-04-22 11:44:34 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-04-24 11:27:59 -0700 |
| commit | d99540b254789c47862d0d7cf8e45e44e7b81115 (patch) | |
| tree | 3220ccc9ce9d149f84d26b536092a7d2cd7053d3 /java/java.go | |
| parent | 0b848b01e8e6ba3b612262cbd7af9775a098c113 (diff) | |
| download | build_soong-d99540b254789c47862d0d7cf8e45e44e7b81115.tar.gz build_soong-d99540b254789c47862d0d7cf8e45e44e7b81115.tar.bz2 build_soong-d99540b254789c47862d0d7cf8e45e44e7b81115.zip | |
Repeat kapt processor argument for multiple processors
kapt claims to support a comma separated list of annotation
processors, but it errors if multiple annotation processors
are given. Surrounding the the list with {} does not error,
but it also doesn't even warn if the second element in the
list is garbage, so it may not be running the second
processor. Repeat the processor argument for each
annotation processor class instead.
Bug: 154736649
Test: TestKapt
Test: m checkbuild
Change-Id: I4c7c161dbf867d7fba1aaf16fd5e502647e3f682
Merged-In: I4c7c161dbf867d7fba1aaf16fd5e502647e3f682
(cherry picked from commit 5a11686e64d7c6665589458a94f183d0823dc833)
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index 57ed29d1..1c2e22a5 100644 --- a/java/java.go +++ b/java/java.go @@ -1134,7 +1134,8 @@ func (j *Module) collectBuilderFlags(ctx android.ModuleContext, deps deps) javaB flags.java9Classpath = append(flags.java9Classpath, deps.java9Classpath...) flags.processorPath = append(flags.processorPath, deps.processorPath...) - flags.processor = strings.Join(deps.processorClasses, ",") + flags.processors = append(flags.processors, deps.processorClasses...) + flags.processors = android.FirstUniqueStrings(flags.processors) if len(flags.bootClasspath) == 0 && ctx.Host() && !flags.javaVersion.usesJavaModules() && decodeSdkDep(ctx, sdkContext(j)).hasStandardLibs() { @@ -1269,7 +1270,7 @@ func (j *Module) compile(ctx android.ModuleContext, aaptSrcJar android.Path) { srcJars = append(srcJars, kaptSrcJar) // Disable annotation processing in javac, it's already been handled by kapt flags.processorPath = nil - flags.processor = "" + flags.processors = nil } kotlinJar := android.PathForModuleOut(ctx, "kotlin", jarName) |