remove support for *.rc files

We're now packaging llvm-windres (aosp/1870074) which can be used as a
substitute for GNU binutils' windres, but we've also removed the last
consumer of .rc files in aosp/1867048 (external/mdnsresponder/).

In the worst case, we can bring back support for .rc files but instead
process them with llvm-windres.

Bug: 203794880
Test: lunch aosp_cf_x86_64_phone-userdebug && m
Change-Id: I30a873537e004b46a87191a932d076a89463c873
This commit is contained in:
Nick Desaulniers
2021-10-26 10:03:58 -07:00
parent 68f309abf9
commit 16bc50a128
3 changed files with 0 additions and 36 deletions

View File

@@ -238,14 +238,6 @@ var (
},
"asFlags")
// Rule to invoke windres, for interaction with Windows resources.
windres = pctx.AndroidStaticRule("windres",
blueprint.RuleParams{
Command: "$windresCmd $flags -I$$(dirname $in) -i $in -o $out --preprocessor \"${config.ClangBin}/clang -E -xc-header -DRC_INVOKED\"",
CommandDeps: []string{"$windresCmd"},
},
"windresCmd", "flags")
_ = pctx.SourcePathVariable("sAbiDumper", "prebuilts/clang-tools/${config.HostPrebuiltTag}/bin/header-abi-dumper")
// -w has been added since header-abi-dumper does not need to produce any sort of diagnostic information.
@@ -577,20 +569,6 @@ func transformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles, no
},
})
continue
case ".rc":
ctx.Build(pctx, android.BuildParams{
Rule: windres,
Description: "windres " + srcFile.Rel(),
Output: objFile,
Input: srcFile,
Implicits: cFlagsDeps,
OrderOnly: pathDeps,
Args: map[string]string{
"windresCmd": mingwCmd(flags.toolchain, "windres"),
"flags": shareFlags("flags", flags.toolchain.WindresFlags()),
},
})
continue
case ".o":
objFiles[i] = srcFile
continue

View File

@@ -95,8 +95,6 @@ type Toolchain interface {
YasmFlags() string
WindresFlags() string
Is64Bit() bool
ShlibSuffix() string
@@ -169,10 +167,6 @@ func (toolchainBase) YasmFlags() string {
return ""
}
func (toolchainBase) WindresFlags() string {
return ""
}
func (toolchainBase) LibclangRuntimeLibraryArch() string {
return ""
}

View File

@@ -188,14 +188,6 @@ func (t *toolchainWindows) IncludeFlags() string {
return "${config.WindowsIncludeFlags}"
}
func (t *toolchainWindowsX86) WindresFlags() string {
return "-F pe-i386"
}
func (t *toolchainWindowsX8664) WindresFlags() string {
return "-F pe-x86-64"
}
func (t *toolchainWindowsX86) ClangTriple() string {
return "i686-windows-gnu"
}