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

@@ -87,7 +87,7 @@ func registerBuildActionForModuleFileList(ctx android.ModuleContext,
content = append(content, file.String())
}
ctx.ModuleBuild(pctx, android.ModuleBuildParams{
ctx.Build(pctx, android.BuildParams{
Rule: android.WriteFile,
Description: "generate " + fileList.Rel(),
Output: fileList,
@@ -140,7 +140,7 @@ func registerBuildActionForParFile(ctx android.ModuleContext, embedded_launcher
// added stub file to the soong_zip args.
parArgs = append(parArgs, `-P "" `+`-C `+strings.TrimSuffix(stub, mainFileName)+` -f `+stub)
ctx.ModuleBuild(pctx, android.ModuleBuildParams{
ctx.Build(pctx, android.BuildParams{
Rule: host_par,
Description: "host python archive",
Output: binFile,
@@ -169,7 +169,7 @@ func registerBuildActionForParFile(ctx android.ModuleContext, embedded_launcher
parArgs = append(parArgs, `-P "" `+`-C `+fmt.Sprintf(
"%q", strings.TrimSuffix(entryPoint, entryPointFile))+` -f `+entryPoint)
ctx.ModuleBuild(pctx, android.ModuleBuildParams{
ctx.Build(pctx, android.BuildParams{
Rule: embedded_par,
Description: "embedded python archive",
Output: binFile,