diff options
| author | 2020-04-24 15:51:13 +0000 | |
|---|---|---|
| committer | 2020-04-24 15:51:13 +0000 | |
| commit | 52c0b7b35b5c5b510bac0a0a98d493b7d953a10d (patch) | |
| tree | e3a1517b40bc0d4531f2633952c88b086ff1287f /java/builder.go | |
| parent | dc455395eec55c488035046238147f2c4edea5b6 (diff) | |
| parent | 5a11686e64d7c6665589458a94f183d0823dc833 (diff) | |
Merge "Repeat kapt processor argument for multiple processors"
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/builder.go b/java/builder.go index 98f70cd27..6844809f8 100644 --- a/java/builder.go +++ b/java/builder.go @@ -196,7 +196,7 @@ type javaBuilderFlags struct { classpath classpath java9Classpath classpath processorPath classpath - processor string + processors []string systemModules *systemModules aidlFlags string aidlDeps android.Paths @@ -270,8 +270,8 @@ func emitXrefRule(ctx android.ModuleContext, xrefFile android.WritablePath, idx deps = append(deps, flags.processorPath...) processor := "-proc:none" - if flags.processor != "" { - processor = "-processor " + flags.processor + if len(flags.processors) > 0 { + processor = "-processor " + strings.Join(flags.processors, ",") } intermediatesDir := "xref" @@ -385,8 +385,8 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab deps = append(deps, flags.processorPath...) processor := "-proc:none" - if flags.processor != "" { - processor = "-processor " + flags.processor + if len(flags.processors) > 0 { + processor = "-processor " + strings.Join(flags.processors, ",") } srcJarDir := "srcjars" |