summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--soong/bindings_generator.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/soong/bindings_generator.go b/soong/bindings_generator.go
index 0cf0d0e33f..bfa88385c8 100644
--- a/soong/bindings_generator.go
+++ b/soong/bindings_generator.go
@@ -45,14 +45,14 @@ var (
-d ${package}
${flags}
--bytecode_path=${templateDir}
- --generators=${generator}
+ --generators=${mojomGenerator}
--use_new_wrapper_types
${in}`,
CommandDeps: []string{
"${mojomBindingsGenerator}",
},
Description: "Mojo sources generation $in => $out",
- }, "generator", "package", "flags", "outDir", "templateDir")
+ }, "mojomGenerator", "package", "flags", "outDir", "templateDir")
mergeSrcjarsRule = pctx.StaticRule("mergeSrcjarsRule", blueprint.RuleParams{
Command: "${mergeZips} ${out} ${in}",
@@ -232,7 +232,7 @@ type mojomSrcsRuleDescription struct {
// current module.
func (p *mojomGenerationProperties) generateBuildActions(
ctx android.ModuleContext,
- generator string,
+ mojomGenerator string,
descriptions []mojomSrcsRuleDescription,
) android.Paths {
packageName := android.PathForModuleSrc(ctx, "").Rel()
@@ -261,11 +261,11 @@ func (p *mojomGenerationProperties) generateBuildActions(
Implicits: implicitDeps,
Outputs: outs,
Args: map[string]string{
- "generator": generator,
- "package": packageName,
- "flags": fmt.Sprintf("%s %s", p.flags(ctx), description.extraFlags),
- "outDir": outDir.String(),
- "templateDir": templateDir,
+ "mojomGenerator": mojomGenerator,
+ "package": packageName,
+ "flags": fmt.Sprintf("%s %s", p.flags(ctx), description.extraFlags),
+ "outDir": outDir.String(),
+ "templateDir": templateDir,
},
})
}