openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactor cc compiling to shared ccBase and ccDynamic initialization 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
cc/cc.go
View File

@ -227,6 +227,52 @@ type ccModuleType interface {
outputFile() string
}
type ccDeps struct {
staticLibs, sharedLibs, lateStaticLibs, wholeStaticLibs, objFiles, includeDirs []string
crtBegin, crtEnd string
}
type ccFlags struct {
globalFlags []string
asFlags []string
cFlags []string
conlyFlags []string
cppFlags []string
ldFlags []string
ldLibs []string
includeDirs []string
nocrt bool
toolchain toolchain
clang bool
extraStaticLibs []string
extraSharedLibs []string
}
// ccBase contains the properties and members used by all C/C++ module types, and implements
// the blueprint.Module interface. It expects to be embedded into an outer specialization struct,
// and uses a ccModuleType interface to that struct to create the build steps.
type ccBase struct {
common.AndroidModuleBase
module ccModuleType
properties ccProperties
unused unusedProperties
installPath string
}
func newCCBase(base *ccBase, module ccModuleType, hod common.HostOrDeviceSupported,
multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) {
base.module = module
props = append(props, &base.properties, &base.unused)
return common.InitAndroidModule(module, hod, multilib, props...)
}
func (c *ccBase) GenerateAndroidBuildActions(ctx common.AndroidModuleContext) {
toolchain := c.findToolchain(ctx)
if ctx.Failed() {
@ -275,40 +321,6 @@ func (c *ccBase) findToolchain(ctx common.AndroidModuleContext) toolchain {
return factory(arch.ArchVariant, arch.CpuVariant)
}
type ccDeps struct {
staticLibs, sharedLibs, lateStaticLibs, wholeStaticLibs, objFiles, includeDirs []string
crtBegin, crtEnd string
}
type ccFlags struct {
globalFlags []string
asFlags []string
cFlags []string
conlyFlags []string
cppFlags []string
ldFlags []string
ldLibs []string
includeDirs []string
nocrt bool
toolchain toolchain
clang bool
extraStaticLibs []string
extraSharedLibs []string
}
// ccBase contains the properties and members used by all C/C++ module types
type ccBase struct {
common.AndroidModuleBase
module ccModuleType
properties ccProperties
unused unusedProperties
installPath string
}
func (c *ccBase) moduleTypeCflags(ctx common.AndroidModuleContext, toolchain toolchain) []string {
return nil
}
@ -617,6 +629,14 @@ type ccDynamic struct {
ccBase
}
func newCCDynamic(dynamic *ccDynamic, module ccModuleType, hod common.HostOrDeviceSupported,
multilib common.Multilib, props ...interface{}) (blueprint.Module, []interface{}) {
dynamic.properties.System_shared_libs = []string{defaultSystemSharedLibraries}
return newCCBase(&dynamic.ccBase, module, hod, multilib, props...)
}
const defaultSystemSharedLibraries = "__default__"
func (c *ccDynamic) systemSharedLibs() []string {
@ -750,15 +770,18 @@ type ccLibrary struct {
}
}
func newCCLibrary(library *ccLibrary, hod common.HostOrDeviceSupported) (blueprint.Module, []interface{}) {
return newCCDynamic(&library.ccDynamic, library, hod, common.MultilibBoth,
&library.libraryProperties)
}
func NewCCLibrary() (blueprint.Module, []interface{}) {
module := &ccLibrary{}
module.module = module
module.properties.System_shared_libs = []string{defaultSystemSharedLibraries}
module.libraryProperties.BuildShared = true
module.libraryProperties.BuildStatic = true
return common.InitAndroidModule(module, common.HostAndDeviceSupported, "both",
&module.properties, &module.unused, &module.libraryProperties)
return newCCLibrary(module, common.HostAndDeviceSupported)
}
func (c *ccLibrary) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string {
@ -943,10 +966,8 @@ type ccObject struct {
func NewCCObject() (blueprint.Module, []interface{}) {
module := &ccObject{}
module.module = module
return common.InitAndroidModule(module, common.DeviceSupported, "both",
&module.properties, &module.unused)
return newCCBase(&module.ccBase, module, common.DeviceSupported, common.MultilibBoth)
}
func (*ccObject) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerModuleContext) []string {
@ -1030,11 +1051,9 @@ func (c *ccBinary) AndroidDynamicDependencies(ctx common.AndroidDynamicDependerM
func NewCCBinary() (blueprint.Module, []interface{}) {
module := &ccBinary{}
module.module = module
module.properties.System_shared_libs = []string{defaultSystemSharedLibraries}
return common.InitAndroidModule(module, common.HostAndDeviceSupported, "first", &module.properties,
&module.unused, &module.binaryProperties)
return newCCDynamic(&module.ccDynamic, module, common.HostAndDeviceSupported, common.MultilibFirst,
&module.binaryProperties)
}
func (c *ccBinary) moduleTypeCflags(ctx common.AndroidModuleContext, toolchain toolchain) []string {
@ -1083,11 +1102,9 @@ func (c *ccBinary) compileModule(ctx common.AndroidModuleContext,
func NewCCLibraryStatic() (blueprint.Module, []interface{}) {
module := &ccLibrary{}
module.module = module
module.libraryProperties.BuildStatic = true
return common.InitAndroidModule(module, common.HostAndDeviceSupported, "both",
&module.properties, &module.unused)
return newCCLibrary(module, common.HostAndDeviceSupported)
}
//
@ -1096,12 +1113,9 @@ func NewCCLibraryStatic() (blueprint.Module, []interface{}) {
func NewCCLibraryShared() (blueprint.Module, []interface{}) {
module := &ccLibrary{}
module.module = module
module.properties.System_shared_libs = []string{defaultSystemSharedLibraries}
module.libraryProperties.BuildShared = true
return common.InitAndroidModule(module, common.HostAndDeviceSupported, "both",
&module.properties, &module.unused)
return newCCLibrary(module, common.HostAndDeviceSupported)
}
//
@ -1110,11 +1124,9 @@ func NewCCLibraryShared() (blueprint.Module, []interface{}) {
func NewCCLibraryHostStatic() (blueprint.Module, []interface{}) {
module := &ccLibrary{}
module.module = module
module.libraryProperties.BuildStatic = true
return common.InitAndroidModule(module, common.HostSupported, "both",
&module.properties, &module.unused)
return newCCLibrary(module, common.HostSupported)
}
//
@ -1123,11 +1135,9 @@ func NewCCLibraryHostStatic() (blueprint.Module, []interface{}) {
func NewCCLibraryHostShared() (blueprint.Module, []interface{}) {
module := &ccLibrary{}
module.module = module
module.libraryProperties.BuildShared = true
return common.InitAndroidModule(module, common.HostSupported, "both",
&module.properties, &module.unused)
return newCCLibrary(module, common.HostSupported)
}
//
@ -1136,10 +1146,8 @@ func NewCCLibraryHostShared() (blueprint.Module, []interface{}) {
func NewCCBinaryHost() (blueprint.Module, []interface{}) {
module := &ccBinary{}
module.module = module
return common.InitAndroidModule(module, common.HostSupported, "first",
&module.properties, &module.unused)
return newCCDynamic(&module.ccDynamic, module, common.HostSupported, common.MultilibFirst)
}
//
@ -1162,10 +1170,8 @@ func (*toolchainLibrary) collectDeps(ctx common.AndroidModuleContext, flags ccFl
func NewToolchainLibrary() (blueprint.Module, []interface{}) {
module := &toolchainLibrary{}
module.module = module
module.libraryProperties.BuildStatic = true
return common.InitAndroidModule(module, common.DeviceSupported, "both")
return newCCBase(&module.ccBase, module, common.DeviceSupported, common.MultilibBoth)
}
func (c *toolchainLibrary) compileModule(ctx common.AndroidModuleContext,

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()