StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove cc.Customizer am: b4ce0ecad6

Browse Source 
am: c471ad53ff

Change-Id: I8bcc141525d794d8214739f8296ccdf033d0c12b
This commit is contained in:
Colin Cross
2016-09-13 22:54:22 +00:00
committed by android-build-merger
parent 3c0809424b c471ad53ff
commit 6e41798485
1 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
cc/cc.go
View File

@@ -148,18 +148,6 @@ type BaseModuleContext interface {
ModuleContextIntf ModuleContextIntf
} }
type CustomizerFlagsContext interface {
BaseModuleContext
AppendCflags(...string)
AppendLdflags(...string)
AppendAsflags(...string)
}
type Customizer interface {
Flags(CustomizerFlagsContext)
Properties() []interface{}
}
type feature interface { type feature interface {
begin(ctx BaseModuleContext) begin(ctx BaseModuleContext)
deps(ctx BaseModuleContext, deps Deps) Deps deps(ctx BaseModuleContext, deps Deps) Deps
@@ -235,13 +223,12 @@ type Module struct {
multilib android.Multilib multilib android.Multilib
// delegates, initialize before calling Init // delegates, initialize before calling Init
Customizer Customizer features []feature
features []feature compiler compiler
compiler compiler linker linker
linker linker installer installer
installer installer stl *stl
stl *stl sanitize *sanitize
sanitize *sanitize
androidMkSharedLibDeps []string androidMkSharedLibDeps []string
@@ -254,9 +241,6 @@ type Module struct {
func (c *Module) Init() (blueprint.Module, []interface{}) { func (c *Module) Init() (blueprint.Module, []interface{}) {
props := []interface{}{&c.Properties, &c.unused} props := []interface{}{&c.Properties, &c.unused}
if c.Customizer != nil {
props = append(props, c.Customizer.Properties()...)
}
if c.compiler != nil { if c.compiler != nil {
props = append(props, c.compiler.compilerProps()...) props = append(props, c.compiler.compilerProps()...)
} }
@@ -307,21 +291,6 @@ type moduleContextImpl struct {
ctx BaseModuleContext ctx BaseModuleContext
} }
func (ctx *moduleContextImpl) AppendCflags(flags ...string) {
CheckBadCompilerFlags(ctx.ctx, "", flags)
ctx.mod.compiler.appendCflags(flags)
}
func (ctx *moduleContextImpl) AppendAsflags(flags ...string) {
CheckBadCompilerFlags(ctx.ctx, "", flags)
ctx.mod.compiler.appendAsflags(flags)
}
func (ctx *moduleContextImpl) AppendLdflags(flags ...string) {
CheckBadLinkerFlags(ctx.ctx, "", flags)
ctx.mod.linker.appendLdflags(flags)
}
func (ctx *moduleContextImpl) clang() bool { func (ctx *moduleContextImpl) clang() bool {
return ctx.mod.clang(ctx.ctx) return ctx.mod.clang(ctx.ctx)
} }
@@ -396,10 +365,6 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
} }
ctx.ctx = ctx ctx.ctx = ctx
if c.Customizer != nil {
c.Customizer.Flags(ctx)
}
flags := Flags{ flags := Flags{
Toolchain: c.toolchain(ctx), Toolchain: c.toolchain(ctx),
Clang: c.clang(ctx), Clang: c.clang(ctx),