From ae88703df55dcd721ccd5c3cca4c02c7b541ca9d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 23 Oct 2017 17:16:14 -0700 Subject: 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 --- cc/gen.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cc/gen.go') diff --git a/cc/gen.go b/cc/gen.go index 2280e0f7..15b37b5c 100644 --- a/cc/gen.go +++ b/cc/gen.go @@ -66,7 +66,7 @@ var ( func genYacc(ctx android.ModuleContext, yaccFile android.Path, outFile android.ModuleGenPath, yaccFlags string) (headerFile android.ModuleGenPath) { headerFile = android.GenPathWithExt(ctx, "yacc", yaccFile, "h") - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: yacc, Description: "yacc " + yaccFile.Rel(), Output: outFile, @@ -83,7 +83,7 @@ func genYacc(ctx android.ModuleContext, yaccFile android.Path, outFile android.M func genAidl(ctx android.ModuleContext, aidlFile android.Path, outFile android.ModuleGenPath, aidlFlags string) android.Paths { - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: aidl, Description: "aidl " + aidlFile.Rel(), Output: outFile, @@ -99,7 +99,7 @@ func genAidl(ctx android.ModuleContext, aidlFile android.Path, outFile android.M } func genLex(ctx android.ModuleContext, lexFile android.Path, outFile android.ModuleGenPath) { - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: lex, Description: "lex " + lexFile.Rel(), Output: outFile, @@ -113,7 +113,7 @@ func genWinMsg(ctx android.ModuleContext, srcFile android.Path, flags builderFla windmcCmd := gccCmd(flags.toolchain, "windmc") - ctx.ModuleBuild(pctx, android.ModuleBuildParams{ + ctx.Build(pctx, android.BuildParams{ Rule: windmc, Description: "windmc " + srcFile.Rel(), Output: rcFile, -- cgit v1.2.3