Revert "Skip creating variants for disabled OSes"

This reverts commit d976af0cb4.

Reason for revert: broke windows SDK build: missing bin/dexdump.exe

Bug: 173663545
Change-Id: Ibb541507650beabd2d94885dd8d66f724a358ca7
This commit is contained in:
Colin Cross
2020-11-19 02:33:19 +00:00
parent d976af0cb4
commit 08d6f8fd75
5 changed files with 8 additions and 56 deletions

View File

@@ -757,7 +757,7 @@ func osMutator(bpctx blueprint.BottomUpMutatorContext) {
for _, os := range OsTypeList {
for _, t := range mctx.Config().Targets[os] {
if base.supportsTarget(t) && base.osEnabled(os) {
if base.supportsTarget(t) {
moduleOSList = append(moduleOSList, os)
break
}
@@ -1183,16 +1183,6 @@ func InitArchModule(m Module) {
}
base.archProperties = append(base.archProperties, archProperties)
m.AddProperties(archProperties...)
// Special case the enabled property so the osMutator can skip creating variants that
// are disabled.
if properties == &base.enabledProperties {
if len(archProperties) != 1 {
panic(fmt.Errorf("expected a single arch-specific enabledProperties type, found %d",
len(archProperties)))
}
base.archEnabledProperties = archProperties[0].(*archPropRoot)
}
}
base.customizableProperties = m.GetProperties()