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

Merge "Repeat kapt processor argument for multiple processors"

Browse Source
This commit is contained in:
Treehugger Robot
2020-04-24 15:51:13 +00:00
committed by Gerrit Code Review
parent dc455395ee 5a11686e64
commit 52c0b7b35b
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/builder.go
View File

@@ -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"