Revert "Skip creating variants for disabled OSes"
This reverts commit d976af0cb47b78a7b4dbc60452d1eff4f0296df6.
Reason for revert: broke windows SDK build: missing bin/dexdump.exe
Bug: 173663545
Change-Id: Ibb541507650beabd2d94885dd8d66f724a358ca7
diff --git a/android/arch.go b/android/arch.go
index a5d416c..afb9c7f 100644
--- a/android/arch.go
+++ b/android/arch.go
@@ -757,7 +757,7 @@
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 @@
}
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()