diff options
| author | Colin Cross <ccross@android.com> | 2016-08-23 20:10:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-23 20:10:57 +0000 |
| commit | 83964d6f92f0fb4fd4ad65132220f53b07e1e25b (patch) | |
| tree | cc6f5136575fba65a67cf1b577795b315b8fbd3f | |
| parent | 8d6e227c104cd05d3bf5a23e64b7277361b9f882 (diff) | |
| parent | e1d764e369cd49f7d1f485798e073662e0bee4b1 (diff) | |
| download | build_soong-83964d6f92f0fb4fd4ad65132220f53b07e1e25b.tar.gz build_soong-83964d6f92f0fb4fd4ad65132220f53b07e1e25b.tar.bz2 build_soong-83964d6f92f0fb4fd4ad65132220f53b07e1e25b.zip | |
Export DefaultsFactory
am: e1d764e369
Change-Id: I5c4b2350707736d018110670c9739b41ba664401
| -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 |