diff options
| author | Hidehiko Abe <hidehiko@google.com> | 2019-03-14 22:54:39 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-14 22:54:39 -0700 |
| commit | b2d103ccefc28b0ef9002a093db94b4bf5020881 (patch) | |
| tree | 91eb3452492b8b33a1746a5a866201ea5d52ac61 | |
| parent | 4f2f20e6257f928a4e7d8840598da138920d7c95 (diff) | |
| parent | 9e816e3a826fc24a5e0cc507b840b57dcae4b7d3 (diff) | |
| download | libchrome-b2d103ccefc28b0ef9002a093db94b4bf5020881.tar.gz | |
libchrome: Fix soong plugin. am: 3b99ef9765
am: 9e816e3a82
Change-Id: I8c4bcb8800b3752f78e0e61fcd9e315e725a8844
| -rw-r--r-- | soong/bindings_generator.go | 16 |
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, }, }) } |