diff options
Diffstat (limited to 'java/builder.go')
| -rw-r--r-- | java/builder.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/java/builder.go b/java/builder.go index c0fadd42c..0f6876ecd 100644 --- a/java/builder.go +++ b/java/builder.go @@ -415,7 +415,7 @@ func TransformJavaToHeaderClasses(ctx android.ModuleContext, outputFile android. } // TurbineApt produces a rule to run annotation processors using turbine. -func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.WritablePath, +func TurbineApt(ctx android.ModuleContext, outputJar, outputSrcJar, outputResJar android.WritablePath, srcFiles, srcJars android.Paths, flags javaBuilderFlags) { turbineFlags, deps := turbineFlags(ctx, flags) @@ -426,8 +426,9 @@ func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.Wr turbineFlags += " " + flags.processorPath.FormTurbineClassPath("--processorpath ") turbineFlags += " --processors " + strings.Join(flags.processors, " ") - outputs := android.WritablePaths{outputSrcJar, outputResJar} - outputFlags := "--gensrc_output " + outputSrcJar.String() + ".tmp " + + outputs := android.WritablePaths{outputJar, outputSrcJar, outputResJar} + outputFlags := "--output " + outputJar.String() + ".tmp " + + "--gensrc_output " + outputSrcJar.String() + ".tmp " + "--resource_output " + outputResJar.String() + ".tmp" rule := turbine @@ -442,7 +443,9 @@ func TurbineApt(ctx android.ModuleContext, outputSrcJar, outputResJar android.Wr if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_TURBINE") { rule = turbineRE args["implicits"] = strings.Join(deps.Strings(), ",") - args["rbeOutputs"] = outputSrcJar.String() + ".tmp," + outputResJar.String() + ".tmp" + args["rbeOutputs"] = outputJar.String() + ".tmp," + + outputSrcJar.String() + ".tmp," + + outputResJar.String() + ".tmp" } ctx.Build(pctx, android.BuildParams{ Rule: rule, |