Move ModuleContext.ModuleBuild to ModuleContext.Build

Now that android.ModuleContext does not include blueprint.ModuleContext
we can rename android.ModuleContext.ModuleBuild to
android.ModuleContext.Build without colliding with
blueprint.ModuleContext.Build.  Leave ModuleBuild as a wrapper around
Build for now to avoid having to update all the users outside
build/soong simultaneously.

Test: m checkbuild
Change-Id: I18eb8cc04faf002049a11d9aac97e9732ff5d638
This commit is contained in:
Colin Cross
2017-10-23 17:16:14 -07:00
parent 3f68a1362b
commit ae88703df5
17 changed files with 71 additions and 76 deletions

View File

@@ -289,7 +289,7 @@ func (g *Module) generateSourceFile(ctx android.ModuleContext, task generateTask
desc += " " + task.out[0].Base()
}
params := android.ModuleBuildParams{
params := android.BuildParams{
Rule: g.rule,
Description: "generate",
Output: task.out[0],
@@ -304,7 +304,7 @@ func (g *Module) generateSourceFile(ctx android.ModuleContext, task generateTask
depfile := android.GenPathWithExt(ctx, "", task.out[0], task.out[0].Ext()+".d")
params.Depfile = depfile
}
ctx.ModuleBuild(pctx, params)
ctx.Build(pctx, params)
for _, outputFile := range task.out {
g.outputFiles = append(g.outputFiles, outputFile)