diff options
author | Colin Cross <ccross@android.com> | 2016-08-18 14:18:32 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2016-08-22 17:08:06 -0700 |
commit | e1d764e369cd49f7d1f485798e073662e0bee4b1 (patch) | |
tree | cc6f5136575fba65a67cf1b577795b315b8fbd3f /cc | |
parent | 9272ade7a862376d53b43de40a30d89b3ac8db08 (diff) | |
download | build_soong-e1d764e369cd49f7d1f485798e073662e0bee4b1.tar.gz build_soong-e1d764e369cd49f7d1f485798e073662e0bee4b1.tar.bz2 build_soong-e1d764e369cd49f7d1f485798e073662e0bee4b1.zip |
Export DefaultsFactory
Add an exported DefaultsFactory so that external module types can extend
cc_defaults. DefaultsFactory takes a variadic list of additional
property structures. defaultsFactory remains as the module factory for
cc_defaults.
Change-Id: I03b450ab3a31625e7baca165d393a0007fb3e421
Diffstat (limited to 'cc')
-rw-r--r-- | cc/cc.go | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -888,9 +888,13 @@ func (*Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) { } func defaultsFactory() (blueprint.Module, []interface{}) { + return DefaultsFactory() +} + +func DefaultsFactory(props ...interface{}) (blueprint.Module, []interface{}) { module := &Defaults{} - propertyStructs := []interface{}{ + props = append(props, &BaseProperties{}, &BaseCompilerProperties{}, &BaseLinkerProperties{}, @@ -903,12 +907,12 @@ func defaultsFactory() (blueprint.Module, []interface{}) { &StlProperties{}, &SanitizeProperties{}, &StripProperties{}, - } + ) - _, propertyStructs = android.InitAndroidArchModule(module, android.HostAndDeviceDefault, - android.MultilibDefault, propertyStructs...) + _, props = android.InitAndroidArchModule(module, android.HostAndDeviceDefault, + android.MultilibDefault, props...) - return android.InitDefaultsModule(module, module, propertyStructs...) + return android.InitDefaultsModule(module, module, props...) } // lastUniqueElements returns all unique elements of a slice, keeping the last copy of each |