Merge "Minor refactoring of Append/PrependProperties() methods Test: `m... (8c64fa9a) · Commits · e / os / android_build_soong

android/hooks.go

+7 −14

Original line number	Diff line number	Diff line
		@@ -65,10 +65,10 @@ func (l *loadHookContext) moduleFactories() map[string]blueprint.ModuleFactory {
		return l.bp.ModuleFactories()
		}

		func (l *loadHookContext) AppendProperties(props ...interface{}) {
		func (l *loadHookContext) appendPrependHelper(props []interface{},
		extendFn func([]interface{}, interface{}, proptools.ExtendPropertyFilterFunc) error) {
		for _, p := range props {
		err := proptools.AppendMatchingProperties(l.Module().base().customizableProperties,
		p, nil)
		err := extendFn(l.Module().base().customizableProperties, p, nil)
		if err != nil {
		if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
		l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
		@@ -78,19 +78,12 @@ func (l *loadHookContext) AppendProperties(props ...interface{}) {
		}
		}
		}
		func (l *loadHookContext) AppendProperties(props ...interface{}) {
		l.appendPrependHelper(props, proptools.AppendMatchingProperties)
		}

		func (l *loadHookContext) PrependProperties(props ...interface{}) {
		for _, p := range props {
		err := proptools.PrependMatchingProperties(l.Module().base().customizableProperties,
		p, nil)
		if err != nil {
		if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
		l.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
		} else {
		panic(err)
		}
		}
		}
		l.appendPrependHelper(props, proptools.PrependMatchingProperties)
		}

		func (l *loadHookContext) CreateModule(factory ModuleFactory, props ...interface{}) Module {

android/module.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -1148,7 +1148,7 @@ func (attrs CommonAttributes) fillCommonBp2BuildModuleAttrs(ctx topDownMutator
		// }
		// }
		//
		// func NewMyModule() android.Module) {
		// func NewMyModule() android.Module {
		// m := &myModule{}
		// m.AddProperties(&m.properties)
		// android.InitAndroidModule(m)

android/mutator.go

+8 −14

Original line number	Diff line number	Diff line
		@@ -529,10 +529,10 @@ func (t *topDownMutatorContext) CreateBazelTargetModule(
		mod.base().addBp2buildInfo(info)
		}

		func (t *topDownMutatorContext) AppendProperties(props ...interface{}) {
		func (t *topDownMutatorContext) appendPrependHelper(props []interface{},
		extendFn func([]interface{}, interface{}, proptools.ExtendPropertyFilterFunc) error) {
		for _, p := range props {
		err := proptools.AppendMatchingProperties(t.Module().base().customizableProperties,
		p, nil)
		err := extendFn(t.Module().base().customizableProperties, p, nil)
		if err != nil {
		if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
		t.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
		@@ -543,18 +543,12 @@ func (t *topDownMutatorContext) AppendProperties(props ...interface{}) {
		}
		}

		func (t *topDownMutatorContext) PrependProperties(props ...interface{}) {
		for _, p := range props {
		err := proptools.PrependMatchingProperties(t.Module().base().customizableProperties,
		p, nil)
		if err != nil {
		if propertyErr, ok := err.(*proptools.ExtendPropertyError); ok {
		t.PropertyErrorf(propertyErr.Property, "%s", propertyErr.Err.Error())
		} else {
		panic(err)
		}
		}
		func (t *topDownMutatorContext) AppendProperties(props ...interface{}) {
		t.appendPrependHelper(props, proptools.AppendMatchingProperties)
		}

		func (t *topDownMutatorContext) PrependProperties(props ...interface{}) {
		t.appendPrependHelper(props, proptools.PrependMatchingProperties)
		}

		// android.topDownMutatorContext either has to embed blueprint.TopDownMutatorContext, in which case every method that