Merge "Enable benchmarks on darwin"
This commit is contained in:
11
cc/test.go
11
cc/test.go
@@ -16,7 +16,6 @@ package cc
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"runtime"
|
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"android/soong/android"
|
"android/soong/android"
|
||||||
@@ -377,16 +376,6 @@ func (benchmark *benchmarkDecorator) install(ctx ModuleContext, file android.Pat
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewBenchmark(hod android.HostOrDeviceSupported) *Module {
|
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, binary := NewBinary(hod)
|
||||||
module.multilib = android.MultilibBoth
|
module.multilib = android.MultilibBoth
|
||||||
binary.baseInstaller = NewBaseInstaller("benchmarktest", "benchmarktest64", InstallInData)
|
binary.baseInstaller = NewBaseInstaller("benchmarktest", "benchmarktest64", InstallInData)
|
||||||
|
Reference in New Issue
Block a user