remove support for *.mc files
We've also removed the last consumer of .mc files in aosp/1867048 (external/mdnsresponder/). Bug: 203794880 Test: lunch aosp_cf_x86_64_phone-userdebug && m Signed-off-by: Nick Desaulniers <ndesaulniers@google.com> Change-Id: I2883a04d04b099273261d76319261d0857aa0300
This commit is contained in:
@@ -537,11 +537,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
|
|||||||
"-I"+android.PathForModuleGen(ctx, "yacc", ctx.ModuleDir()).String())
|
"-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") {
|
if compiler.hasSrcExt(".aidl") {
|
||||||
flags.aidlFlags = append(flags.aidlFlags, compiler.Properties.Aidl.Flags...)
|
flags.aidlFlags = append(flags.aidlFlags, compiler.Properties.Aidl.Flags...)
|
||||||
if len(compiler.Properties.Aidl.Local_include_dirs) > 0 {
|
if len(compiler.Properties.Aidl.Local_include_dirs) > 0 {
|
||||||
|
31
cc/gen.go
31
cc/gen.go
@@ -45,13 +45,6 @@ var (
|
|||||||
CommandDeps: []string{"$syspropCmd"},
|
CommandDeps: []string{"$syspropCmd"},
|
||||||
},
|
},
|
||||||
"headerOutDir", "publicOutDir", "srcOutDir", "includeName")
|
"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 {
|
type YaccProperties struct {
|
||||||
@@ -200,26 +193,6 @@ func genSysprop(ctx android.ModuleContext, syspropFile android.Path) (android.Pa
|
|||||||
return cppFile, headers.Paths()
|
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
|
// Used to communicate information from the genSources method back to the library code that uses
|
||||||
// it.
|
// it.
|
||||||
type generatedSourceInfo struct {
|
type generatedSourceInfo struct {
|
||||||
@@ -305,10 +278,6 @@ func genSources(ctx android.ModuleContext, srcFiles android.Paths,
|
|||||||
cppFile := rsGeneratedCppFile(ctx, srcFile)
|
cppFile := rsGeneratedCppFile(ctx, srcFile)
|
||||||
rsFiles = append(rsFiles, srcFiles[i])
|
rsFiles = append(rsFiles, srcFiles[i])
|
||||||
srcFiles[i] = cppFile
|
srcFiles[i] = cppFile
|
||||||
case ".mc":
|
|
||||||
rcFile, headerFile := genWinMsg(ctx, srcFile, buildFlags)
|
|
||||||
srcFiles[i] = rcFile
|
|
||||||
deps = append(deps, headerFile)
|
|
||||||
case ".sysprop":
|
case ".sysprop":
|
||||||
cppFile, headerFiles := genSysprop(ctx, srcFile)
|
cppFile, headerFiles := genSysprop(ctx, srcFile)
|
||||||
srcFiles[i] = cppFile
|
srcFiles[i] = cppFile
|
||||||
|
Reference in New Issue
Block a user