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

Support cc_test_host

Browse Source 
Support cc_test_host for gtest tests compiled for the host.

Change-Id: I632d2c211075ba9391d934609f1bf368459397e1
This commit is contained in:
Colin Cross
2015-03-26 16:09:47 -07:00
parent 4ae185c7ec
commit 1f8f234c33
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
cc/cc.go
View File

@@ -1214,10 +1214,11 @@ func (c *CCBinary) DepNames(ctx common.AndroidBaseContext, depNames CCDeps) CCDe
}
func NewCCBinary(binary *CCBinary, module CCModuleType,
hod common.HostOrDeviceSupported) (blueprint.Module, []interface{}) {
hod common.HostOrDeviceSupported, props ...interface{}) (blueprint.Module, []interface{}) {
return newCCDynamic(&binary.ccLinked, module, hod, common.MultilibFirst,
&binary.BinaryProperties)
props = append(props, &binary.BinaryProperties)
return newCCDynamic(&binary.ccLinked, module, hod, common.MultilibFirst, props...)
}
func CCBinaryFactory() (blueprint.Module, []interface{}) {
@@ -1334,8 +1335,8 @@ func (c *ccTest) installModule(ctx common.AndroidModuleContext, flags CCFlags) {
func CCTestFactory() (blueprint.Module, []interface{}) {
module := &ccTest{}
return newCCDynamic(&module.ccLinked, module, common.HostAndDeviceSupported,
common.MultilibFirst, &module.BinaryProperties, &module.testProperties)
return NewCCBinary(&module.CCBinary, module, common.HostAndDeviceSupported,
&module.testProperties)
}
func TestPerSrcMutator(mctx blueprint.EarlyMutatorContext) {
@@ -1408,6 +1409,16 @@ func CCBinaryHostFactory() (blueprint.Module, []interface{}) {
return NewCCBinary(module, module, common.HostSupported)
}
//
// Host Tests
//
func CCTestHostFactory() (blueprint.Module, []interface{}) {
module := &ccTest{}
return NewCCBinary(&module.CCBinary, module, common.HostSupported,
&module.testProperties)
}
//
// Device libraries shipped with gcc
//