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/defaults.go b/android/defaults.go
index be5359f..eb013d7 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -174,22 +174,20 @@
func InitDefaultsModule(module DefaultsModule) {
commonProperties := &commonProperties{}
- enabledProperties := &enabledProperties{}
module.AddProperties(
&hostAndDeviceProperties{},
- enabledProperties,
commonProperties,
&ApexProperties{},
&distProperties{})
- base := module.base()
initAndroidModuleBase(module)
initProductVariableModule(module)
InitArchModule(module)
InitDefaultableModule(module)
// Add properties that will not have defaults applied to them.
+ base := module.base()
defaultsVisibility := &DefaultsVisibilityProperties{}
module.AddProperties(&base.nameProperties, defaultsVisibility)