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

Refactor cc compiling to shared ccBase and ccDynamic initialization

Browse Source 
Refactor common code out of NewCC* to initialize the ccBase,
ccDynamic, and ccLibrary structures.  Also adds an enum for the
default multilib values.

Change-Id: Iaeffe86bf2568b6054be4ddcee725818af45e14f
This commit is contained in:
Colin Cross
2015-03-17 15:06:21 -07:00
parent e2e6fc2b37
commit c472d57f57
3 changed files with 80 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/arch.go
View File

@@ -293,12 +293,12 @@ func ArchMutator(mctx blueprint.EarlyMutatorContext) {
}
}
func InitArchModule(m AndroidModule, defaultMultilib string,
func InitArchModule(m AndroidModule, defaultMultilib Multilib,
propertyStructs ...interface{}) (blueprint.Module, []interface{}) {
base := m.base()
base.commonProperties.Compile_multilib = defaultMultilib
base.commonProperties.Compile_multilib = string(defaultMultilib)
base.generalProperties = append(base.generalProperties,
&base.commonProperties)

9
common/module.go
View File

@@ -80,7 +80,14 @@ type hostAndDeviceProperties struct {
Device_supported bool
}
func InitAndroidModule(m AndroidModule, hod HostOrDeviceSupported, defaultMultilib string,
type Multilib string
const (
MultilibBoth Multilib = "both"
MultilibFirst Multilib = "first"
)
func InitAndroidModule(m AndroidModule, hod HostOrDeviceSupported, defaultMultilib Multilib,
propertyStructs ...interface{}) (blueprint.Module, []interface{}) {
base := m.base()