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

Promote stl to a fixed feature

Browse Source 
cc needs to know what stl was selected, promote stl from a generic
feature implementation to a fixed type pointer.

Change-Id: I950ef947f7cd254fe3074f4ff240bb2b90b9116c
This commit is contained in:
Colin Cross
2016-04-04 15:07:06 -07:00
parent 919281aa91
commit a8e07cc653
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cc/stl.go
View File

@@ -28,17 +28,15 @@ type StlProperties struct {
SelectedStl string `blueprint:"mutated"`
}
type stlFeature struct {
type stl struct {
Properties StlProperties
}
var _ feature = (*stlFeature)(nil)
func (stl *stlFeature) props() []interface{} {
func (stl *stl) props() []interface{} {
return []interface{}{&stl.Properties}
}
func (stl *stlFeature) begin(ctx BaseModuleContext) {
func (stl *stl) begin(ctx BaseModuleContext) {
stl.Properties.SelectedStl = func() string {
if ctx.sdk() && ctx.Device() {
switch stl.Properties.Stl {
@@ -84,7 +82,7 @@ func (stl *stlFeature) begin(ctx BaseModuleContext) {
}()
}
func (stl *stlFeature) deps(ctx BaseModuleContext, deps Deps) Deps {
func (stl *stl) deps(ctx BaseModuleContext, deps Deps) Deps {
switch stl.Properties.SelectedStl {
case "libstdc++":
if ctx.Device() {
@@ -124,7 +122,7 @@ func (stl *stlFeature) deps(ctx BaseModuleContext, deps Deps) Deps {
return deps
}
func (stl *stlFeature) flags(ctx ModuleContext, flags Flags) Flags {
func (stl *stl) flags(ctx ModuleContext, flags Flags) Flags {
switch stl.Properties.SelectedStl {
case "libc++", "libc++_static":
flags.CFlags = append(flags.CFlags, "-D_USING_LIBCXX")