diff --git a/cc/compiler.go b/cc/compiler.go index 2ac7bf332..00df66912 100644 --- a/cc/compiler.go +++ b/cc/compiler.go @@ -537,11 +537,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps "-I"+android.PathForModuleGen(ctx, "yacc", ctx.ModuleDir()).String()) } - if compiler.hasSrcExt(".mc") { - flags.Local.CommonFlags = append(flags.Local.CommonFlags, - "-I"+android.PathForModuleGen(ctx, "windmc", ctx.ModuleDir()).String()) - } - if compiler.hasSrcExt(".aidl") { flags.aidlFlags = append(flags.aidlFlags, compiler.Properties.Aidl.Flags...) if len(compiler.Properties.Aidl.Local_include_dirs) > 0 { diff --git a/cc/gen.go b/cc/gen.go index 3a1a0e2cc..8f6236349 100644 --- a/cc/gen.go +++ b/cc/gen.go @@ -45,13 +45,6 @@ var ( CommandDeps: []string{"$syspropCmd"}, }, "headerOutDir", "publicOutDir", "srcOutDir", "includeName") - - windmc = pctx.AndroidStaticRule("windmc", - blueprint.RuleParams{ - Command: "$windmcCmd -r$$(dirname $out) -h$$(dirname $out) $in", - CommandDeps: []string{"$windmcCmd"}, - }, - "windmcCmd") ) type YaccProperties struct { @@ -200,26 +193,6 @@ func genSysprop(ctx android.ModuleContext, syspropFile android.Path) (android.Pa return cppFile, headers.Paths() } -func genWinMsg(ctx android.ModuleContext, srcFile android.Path, flags builderFlags) (android.Path, android.Path) { - headerFile := android.GenPathWithExt(ctx, "windmc", srcFile, "h") - rcFile := android.GenPathWithExt(ctx, "windmc", srcFile, "rc") - - windmcCmd := mingwCmd(flags.toolchain, "windmc") - - ctx.Build(pctx, android.BuildParams{ - Rule: windmc, - Description: "windmc " + srcFile.Rel(), - Output: rcFile, - ImplicitOutput: headerFile, - Input: srcFile, - Args: map[string]string{ - "windmcCmd": windmcCmd, - }, - }) - - return rcFile, headerFile -} - // Used to communicate information from the genSources method back to the library code that uses // it. type generatedSourceInfo struct { @@ -305,10 +278,6 @@ func genSources(ctx android.ModuleContext, srcFiles android.Paths, cppFile := rsGeneratedCppFile(ctx, srcFile) rsFiles = append(rsFiles, srcFiles[i]) srcFiles[i] = cppFile - case ".mc": - rcFile, headerFile := genWinMsg(ctx, srcFile, buildFlags) - srcFiles[i] = rcFile - deps = append(deps, headerFile) case ".sysprop": cppFile, headerFiles := genSysprop(ctx, srcFile) srcFiles[i] = cppFile