diff options
author | Colin Cross <ccross@android.com> | 2016-07-08 10:41:41 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-07-08 11:18:46 -0700 |
commit | 6886183d8faec5af2cdce6f85ab8c9d265bcf4cb (patch) | |
tree | 6a277aa74b07f1e23a02b1bb2544260538e82929 /cc | |
parent | 3c316bc03bb21fa047f4db536fda8aeeba193266 (diff) | |
download | build_soong-6886183d8faec5af2cdce6f85ab8c9d265bcf4cb.tar.gz build_soong-6886183d8faec5af2cdce6f85ab8c9d265bcf4cb.tar.bz2 build_soong-6886183d8faec5af2cdce6f85ab8c9d265bcf4cb.zip |
Remove cc.ModuleContext.module()
cc.ModuleContext.module() returns a *cc.Module, and is left over from
when the cc package tried to use inheritance. Remove it and the last
few users.
Change-Id: I9b42ca59689c1b0ada7980fbec923747ed3a53d3
Diffstat (limited to 'cc')
-rw-r--r-- | cc/cc.go | 36 |
1 files changed, 9 insertions, 27 deletions
@@ -451,7 +451,6 @@ type UnusedProperties struct { } type ModuleContextIntf interface { - module() *Module static() bool staticBinary() bool clang() bool @@ -599,10 +598,6 @@ type moduleContextImpl struct { ctx BaseModuleContext } -func (ctx *moduleContextImpl) module() *Module { - return ctx.mod -} - func (ctx *moduleContextImpl) clang() bool { return ctx.mod.clang(ctx.ctx) } @@ -866,16 +861,16 @@ func (c *Module) depsMutator(actx android.BottomUpMutatorContext) { actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, lateSharedDepTag, deps.LateSharedLibs...) - actx.AddDependency(ctx.module(), genSourceDepTag, deps.GeneratedSources...) - actx.AddDependency(ctx.module(), genHeaderDepTag, deps.GeneratedHeaders...) + actx.AddDependency(c, genSourceDepTag, deps.GeneratedSources...) + actx.AddDependency(c, genHeaderDepTag, deps.GeneratedHeaders...) - actx.AddDependency(ctx.module(), objDepTag, deps.ObjFiles...) + actx.AddDependency(c, objDepTag, deps.ObjFiles...) if deps.CrtBegin != "" { - actx.AddDependency(ctx.module(), crtBeginDepTag, deps.CrtBegin) + actx.AddDependency(c, crtBeginDepTag, deps.CrtBegin) } if deps.CrtEnd != "" { - actx.AddDependency(ctx.module(), crtEndDepTag, deps.CrtEnd) + actx.AddDependency(c, crtEndDepTag, deps.CrtEnd) } } @@ -1554,21 +1549,6 @@ type libraryLinker struct { var _ linker = (*libraryLinker)(nil) -func (library *libraryLinker) begin(ctx BaseModuleContext) { - library.baseLinker.begin(ctx) - if library.static() { - if library.Properties.Static.Enabled != nil && - !*library.Properties.Static.Enabled { - ctx.module().Disable() - } - } else { - if library.Properties.Shared.Enabled != nil && - !*library.Properties.Shared.Enabled { - ctx.module().Disable() - } - } -} - func (library *libraryLinker) props() []interface{} { props := library.baseLinker.props() return append(props, @@ -1743,11 +1723,13 @@ func (library *libraryLinker) link(ctx ModuleContext, } func (library *libraryLinker) buildStatic() bool { - return library.dynamicProperties.BuildStatic + return library.dynamicProperties.BuildStatic && + (library.Properties.Static.Enabled == nil || *library.Properties.Static.Enabled) } func (library *libraryLinker) buildShared() bool { - return library.dynamicProperties.BuildShared + return library.dynamicProperties.BuildShared && + (library.Properties.Shared.Enabled == nil || *library.Properties.Shared.Enabled) } func (library *libraryLinker) getWholeStaticMissingDeps() []string { |