tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disable cc_benchmark for Darwin hosts am: 0b24c74fcb

Browse source 
am: e2934f369d

Change-Id: Id313301de1ea6af65dc173708a844d7ad200ca55
This commit is contained in:
Dan Willemsen 2016-10-05 03:41:13 +00:00 committed by android-build-merger
commit f6428f6afe
3 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/arch.go
View file

@ -267,12 +267,12 @@ func ArchMutator(mctx BottomUpMutatorContext) {
return
}
osClasses := module.base().OsClassSupported()
if len(osClasses) == 0 {
if !module.base().ArchSpecific() {
return
}
osClasses := module.base().OsClassSupported()
var moduleTargets []Target
primaryModules := make(map[int]bool)

7
android/module.go
View file

@ -152,6 +152,7 @@ type commonProperties struct {
// Set by InitAndroidModule
HostOrDeviceSupported HostOrDeviceSupported `blueprint:"mutated"`
ArchSpecific bool `blueprint:"mutated"`
}
type hostAndDeviceProperties struct {
@ -176,6 +177,7 @@ const (
DeviceSupported
HostAndDeviceSupported
HostAndDeviceDefault
NeitherHostNorDeviceSupported
)
func InitAndroidModule(m Module,
@ -197,6 +199,7 @@ func InitAndroidArchModule(m Module, hod HostOrDeviceSupported, defaultMultilib
base := m.base()
base.commonProperties.HostOrDeviceSupported = hod
base.commonProperties.Default_multilib = string(defaultMultilib)
base.commonProperties.ArchSpecific = true
switch hod {
case HostAndDeviceSupported:
@ -305,6 +308,10 @@ func (a *ModuleBase) Arch() Arch {
return a.Target().Arch
}
func (a *ModuleBase) ArchSpecific() bool {
return a.commonProperties.ArchSpecific
}
func (a *ModuleBase) OsClassSupported() []OsClass {
switch a.commonProperties.HostOrDeviceSupported {
case HostSupported:

11
cc/test.go
View file

@ -16,6 +16,7 @@ package cc
import (
"path/filepath"
"runtime"
"strings"
"github.com/google/blueprint"
@ -301,6 +302,16 @@ func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Pat
}
func NewBenchmark(hod android.HostOrDeviceSupported) *Module {
// Benchmarks aren't supported on Darwin
if runtime.GOOS == "darwin" {
switch hod {
case android.HostAndDeviceSupported:
hod = android.DeviceSupported
case android.HostSupported:
hod = android.NeitherHostNorDeviceSupported
}
}
module, binary := NewBinary(hod)
module.multilib = android.MultilibBoth
binary.baseInstaller = NewTestInstaller()