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

Merge changes I0885e493,Ic37c8db9

Browse Source 
* changes:
  linux_bionic_arm64 is added when Host_bionic_arm64 is true
  HostCross is an attribute of a Target, not OsType
This commit is contained in:
Treehugger Robot
2020-09-24 22:56:43 +00:00
committed by Gerrit Code Review
parent 8bd5095362 2210198129
commit 4f6eebff0c
12 changed files with 142 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
android/module.go
View File

@@ -948,7 +948,7 @@ type ModuleBase struct {
initRcPaths Paths
vintfFragmentsPaths Paths
prefer32 func(ctx BaseModuleContext, base *ModuleBase, class OsClass) bool
prefer32 func(ctx BaseModuleContext, base *ModuleBase, os OsType) bool
}
func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {}
@@ -975,7 +975,7 @@ func (m *ModuleBase) VariablesForTests() map[string]string {
return m.variables
}
func (m *ModuleBase) Prefer32(prefer32 func(ctx BaseModuleContext, base *ModuleBase, class OsClass) bool) {
func (m *ModuleBase) Prefer32(prefer32 func(ctx BaseModuleContext, base *ModuleBase, os OsType) bool) {
m.prefer32 = prefer32
}
@@ -1071,7 +1071,7 @@ func (m *ModuleBase) Os() OsType {
}
func (m *ModuleBase) Host() bool {
return m.Os().Class == Host || m.Os().Class == HostCross
return m.Os().Class == Host
}
func (m *ModuleBase) Device() bool {
@@ -1091,28 +1091,28 @@ func (m *ModuleBase) IsCommonOSVariant() bool {
return m.commonProperties.CommonOSVariant
}
func (m *ModuleBase) OsClassSupported() []OsClass {
func (m *ModuleBase) supportsTarget(target Target, config Config) bool {
switch m.commonProperties.HostOrDeviceSupported {
case HostSupported:
return []OsClass{Host, HostCross}
return target.Os.Class == Host
case HostSupportedNoCross:
return []OsClass{Host}
return target.Os.Class == Host && !target.HostCross
case DeviceSupported:
return []OsClass{Device}
return target.Os.Class == Device
case HostAndDeviceSupported, HostAndDeviceDefault:
var supported []OsClass
supported := false
if Bool(m.hostAndDeviceProperties.Host_supported) ||
(m.commonProperties.HostOrDeviceSupported == HostAndDeviceDefault &&
m.hostAndDeviceProperties.Host_supported == nil) {
supported = append(supported, Host, HostCross)
supported = supported || target.Os.Class == Host
}
if m.hostAndDeviceProperties.Device_supported == nil ||
*m.hostAndDeviceProperties.Device_supported {
supported = append(supported, Device)
supported = supported || target.Os.Class == Device
}
return supported
default:
return nil
return false
}
}
@@ -2115,7 +2115,7 @@ func (b *baseModuleContext) Os() OsType {
}
func (b *baseModuleContext) Host() bool {
return b.os.Class == Host || b.os.Class == HostCross
return b.os.Class == Host
}
func (b *baseModuleContext) Device() bool {
@@ -2575,30 +2575,36 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx SingletonContext) {
}
// Create (host|host-cross|target)-<OS> phony rules to build a reduced checkbuild.
osDeps := map[OsType]Paths{}
type osAndCross struct {
os OsType
hostCross bool
}
osDeps := map[osAndCross]Paths{}
ctx.VisitAllModules(func(module Module) {
if module.Enabled() {
os := module.Target().Os
osDeps[os] = append(osDeps[os], module.base().checkbuildFiles...)
key := osAndCross{os: module.Target().Os, hostCross: module.Target().HostCross}
osDeps[key] = append(osDeps[key], module.base().checkbuildFiles...)
}
})
osClass := make(map[string]Paths)
for os, deps := range osDeps {
for key, deps := range osDeps {
var className string
switch os.Class {
switch key.os.Class {
case Host:
className = "host"
case HostCross:
className = "host-cross"
if key.hostCross {
className = "host-cross"
} else {
className = "host"
}
case Device:
className = "target"
default:
continue
}
name := className + "-" + os.Name
name := className + "-" + key.os.Name
osClass[className] = append(osClass[className], PathForPhony(ctx, name))
ctx.Phony(name, deps...)