Rename compiler, linker and installer methods to be unique
compiler, linker, and installer interfaces may be implemented by a
single decorator object, rename their methods to be unique to avoid the
same method being called multiple times.
Test: out/soong/build.ninja unchanged
Change-Id: I1608c41cd68f614ba99c11bb9fcc7936f618d9aa
diff --git a/cc/binary.go b/cc/binary.go
index d6b086c..fd64cda 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -67,8 +67,8 @@
var _ linker = (*binaryLinker)(nil)
-func (binary *binaryLinker) props() []interface{} {
- return append(binary.baseLinker.props(),
+func (binary *binaryLinker) linkerProps() []interface{} {
+ return append(binary.baseLinker.linkerProps(),
&binary.Properties,
&binary.stripper.StripProperties)
@@ -91,8 +91,8 @@
return stem + binary.Properties.Suffix
}
-func (binary *binaryLinker) deps(ctx BaseModuleContext, deps Deps) Deps {
- deps = binary.baseLinker.deps(ctx, deps)
+func (binary *binaryLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps {
+ deps = binary.baseLinker.linkerDeps(ctx, deps)
if ctx.Device() {
if !Bool(binary.baseLinker.Properties.Nocrt) {
if !ctx.sdk() {
@@ -155,8 +155,8 @@
return module
}
-func (binary *binaryLinker) begin(ctx BaseModuleContext) {
- binary.baseLinker.begin(ctx)
+func (binary *binaryLinker) linkerInit(ctx BaseModuleContext) {
+ binary.baseLinker.linkerInit(ctx)
static := Bool(binary.Properties.Static_executable)
if ctx.Host() {
@@ -175,8 +175,8 @@
}
}
-func (binary *binaryLinker) flags(ctx ModuleContext, flags Flags) Flags {
- flags = binary.baseLinker.flags(ctx, flags)
+func (binary *binaryLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags {
+ flags = binary.baseLinker.linkerFlags(ctx, flags)
if ctx.Host() && !binary.staticBinary() {
flags.LdFlags = append(flags.LdFlags, "-pie")