remove support for *.rc files am: 16bc50a128
am: 4e56d1ff60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1870522 Change-Id: I6a684723452a2b694d13ba591549a86c128df2d4
This commit is contained in:
@@ -238,14 +238,6 @@ var (
|
|||||||
},
|
},
|
||||||
"asFlags")
|
"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")
|
_ = 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.
|
// -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
|
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":
|
case ".o":
|
||||||
objFiles[i] = srcFile
|
objFiles[i] = srcFile
|
||||||
continue
|
continue
|
||||||
|
@@ -95,8 +95,6 @@ type Toolchain interface {
|
|||||||
|
|
||||||
YasmFlags() string
|
YasmFlags() string
|
||||||
|
|
||||||
WindresFlags() string
|
|
||||||
|
|
||||||
Is64Bit() bool
|
Is64Bit() bool
|
||||||
|
|
||||||
ShlibSuffix() string
|
ShlibSuffix() string
|
||||||
@@ -169,10 +167,6 @@ func (toolchainBase) YasmFlags() string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (toolchainBase) WindresFlags() string {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func (toolchainBase) LibclangRuntimeLibraryArch() string {
|
func (toolchainBase) LibclangRuntimeLibraryArch() string {
|
||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
@@ -188,14 +188,6 @@ func (t *toolchainWindows) IncludeFlags() string {
|
|||||||
return "${config.WindowsIncludeFlags}"
|
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 {
|
func (t *toolchainWindowsX86) ClangTriple() string {
|
||||||
return "i686-windows-gnu"
|
return "i686-windows-gnu"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user