diff options
author | Colin Cross <ccross@android.com> | 2016-08-01 13:20:05 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-08-01 13:47:15 -0700 |
commit | 42742b8bb043abd3b330defd1bfac4ed756e63ff (patch) | |
tree | 438b1b4102b92b99b63a0a6b516f14b247f20f59 /cc/linker.go | |
parent | b98c8b05954dd78d3c4bb87b0bceeb03ef4b362c (diff) | |
download | build_soong-42742b8bb043abd3b330defd1bfac4ed756e63ff.tar.gz build_soong-42742b8bb043abd3b330defd1bfac4ed756e63ff.tar.bz2 build_soong-42742b8bb043abd3b330defd1bfac4ed756e63ff.zip |
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
Diffstat (limited to 'cc/linker.go')
-rw-r--r-- | cc/linker.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/linker.go b/cc/linker.go index c6f13f22..5b7ea8b8 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -82,7 +82,7 @@ func (linker *baseLinker) appendLdflags(flags []string) { linker.Properties.Ldflags = append(linker.Properties.Ldflags, flags...) } -func (linker *baseLinker) begin(ctx BaseModuleContext) { +func (linker *baseLinker) linkerInit(ctx BaseModuleContext) { if ctx.toolchain().Is64Bit() { linker.dynamicProperties.RunPaths = []string{"../lib64", "lib64"} } else { @@ -90,11 +90,11 @@ func (linker *baseLinker) begin(ctx BaseModuleContext) { } } -func (linker *baseLinker) props() []interface{} { +func (linker *baseLinker) linkerProps() []interface{} { return []interface{}{&linker.Properties, &linker.dynamicProperties} } -func (linker *baseLinker) deps(ctx BaseModuleContext, deps Deps) Deps { +func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { deps.WholeStaticLibs = append(deps.WholeStaticLibs, linker.Properties.Whole_static_libs...) deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Static_libs...) deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Shared_libs...) @@ -133,7 +133,7 @@ func (linker *baseLinker) deps(ctx BaseModuleContext, deps Deps) Deps { return deps } -func (linker *baseLinker) flags(ctx ModuleContext, flags Flags) Flags { +func (linker *baseLinker) linkerFlags(ctx ModuleContext, flags Flags) Flags { toolchain := ctx.toolchain() flags.Nocrt = Bool(linker.Properties.Nocrt) |