From 5f314b16135c3b4ab0b1c3a55f353b3e78cb655b Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 18 May 2021 11:56:02 -0700
Subject: [PATCH] Rename gccCmd mingwCmd now that's all it's used for.

Bug: http://b/185257607
Test: treehugger
Change-Id: Ida079183828444f122ba6ea5662f63796677de7d
---
 cc/builder.go | 4 ++--
 cc/gen.go     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cc/builder.go b/cc/builder.go
index 51c8a0bdf..fae9522f2 100644
--- a/cc/builder.go
+++ b/cc/builder.go
@@ -534,7 +534,7 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
 				Implicits:   cFlagsDeps,
 				OrderOnly:   pathDeps,
 				Args: map[string]string{
-					"windresCmd": gccCmd(flags.toolchain, "windres"),
+					"windresCmd": mingwCmd(flags.toolchain, "windres"),
 					"flags":      flags.toolchain.WindresFlags(),
 				},
 			})
@@ -1069,6 +1069,6 @@ func transformArchiveRepack(ctx android.ModuleContext, inputFile android.Path,
 	})
 }
 
-func gccCmd(toolchain config.Toolchain, cmd string) string {
+func mingwCmd(toolchain config.Toolchain, cmd string) string {
 	return filepath.Join(toolchain.GccRoot(), "bin", toolchain.GccTriple()+"-"+cmd)
 }
diff --git a/cc/gen.go b/cc/gen.go
index b152e02f0..3a1a0e2cc 100644
--- a/cc/gen.go
+++ b/cc/gen.go
@@ -204,7 +204,7 @@ func genWinMsg(ctx android.ModuleContext, srcFile android.Path, flags builderFla
 	headerFile := android.GenPathWithExt(ctx, "windmc", srcFile, "h")
 	rcFile := android.GenPathWithExt(ctx, "windmc", srcFile, "rc")
 
-	windmcCmd := gccCmd(flags.toolchain, "windmc")
+	windmcCmd := mingwCmd(flags.toolchain, "windmc")
 
 	ctx.Build(pctx, android.BuildParams{
 		Rule:           windmc,