Add a Name property
Blueprint is going to abdicate responsibility for determining the name
of a module. Add a name property, and a method to retreive the name.
Test: build.ninja identical
Change-Id: I09c6f5283cd6e28ad4b04c24c5ab8b00f71ae2ab
diff --git a/android/defaults.go b/android/defaults.go
index 11ce099..df1409e 100644
--- a/android/defaults.go
+++ b/android/defaults.go
@@ -80,7 +80,20 @@
}
func InitDefaultsModule(module Module, d Defaults, props ...interface{}) (blueprint.Module, []interface{}) {
- return InitDefaultableModule(module, d, props...)
+ props = append(props,
+ &hostAndDeviceProperties{},
+ &commonProperties{},
+ &variableProperties{})
+
+ _, props = InitArchModule(module, props...)
+
+ _, props = InitDefaultableModule(module, d, props...)
+
+ props = append(props, &module.base().nameProperties)
+
+ module.base().module = module
+
+ return module, props
}
var _ Defaults = (*DefaultsModule)(nil)