diff options
Diffstat (limited to 'android/override_module.go')
| -rw-r--r-- | android/override_module.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/android/override_module.go b/android/override_module.go index 09959e43d..f946587c3 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -70,6 +70,10 @@ func (o *OverrideModuleBase) getOverrideModuleProperties() *OverrideModuleProper return &o.moduleProperties } +func (o *OverrideModuleBase) GetOverriddenModuleName() string { + return proptools.String(o.moduleProperties.Base) +} + func InitOverrideModule(m OverrideModule) { m.setOverridingProperties(m.GetProperties()) @@ -147,7 +151,7 @@ func (b *OverridableModuleBase) override(ctx BaseModuleContext, o OverrideModule for _, p := range b.overridableProperties { for _, op := range o.getOverridingProperties() { if proptools.TypeEqual(p, op) { - err := proptools.AppendProperties(p, op, nil) + err := proptools.ExtendProperties(p, op, nil, proptools.OrderReplace) if err != nil { if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok { ctx.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error()) |