StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issues with bp transformation

Browse Source 
Returning nil from transformPropertySet in order to remove it did
not work because it ends up comparing as (*bpPropertySet, nil) and
not an untyped nil which causes the test against nil to fail.

This change adds tests to check that returning nil will delete a
property/property set from the containing property set and fixes the
code so that it passes the tests. It extracts common code to transform
a property set and its contents as well as code for creating new
property sets.

Bug: 148933848
Bug: 153306490
Test: m nothing
Merged-In: I35dc3c39c76e701821891622615c09b094cf697f
Change-Id: I35dc3c39c76e701821891622615c09b094cf697f
This commit is contained in:
Paul Duffin
2020-02-21 16:06:25 +00:00
parent 853b8dbe0e
commit 598e1e0255
3 changed files with 99 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
sdk/bp.go
View File

@@ -48,8 +48,7 @@ func (s *bpPropertySet) AddPropertyWithTag(name string, value interface{}, tag a
}
func (s *bpPropertySet) AddPropertySet(name string) android.BpPropertySet {
set := &bpPropertySet{}
set.init()
set := newPropertySet()
s.AddProperty(name, set)
return set
}
@@ -62,7 +61,7 @@ func (s *bpPropertySet) getTag(name string) interface{} {
return s.tags[name]
}
func (s *bpPropertySet) transform(transformer bpPropertyTransformer) {
func (s *bpPropertySet) transformContents(transformer bpPropertyTransformer) {
var newOrder []string
for _, name := range s.order {
value := s.properties[name]
@@ -70,7 +69,13 @@ func (s *bpPropertySet) transform(transformer bpPropertyTransformer) {
var newValue interface{}
var newTag android.BpPropertyTag
if propertySet, ok := value.(*bpPropertySet); ok {
newValue, newTag = transformer.transformPropertySet(name, propertySet, tag)
var newPropertySet *bpPropertySet
newPropertySet, newTag = transformPropertySet(transformer, name, propertySet, tag)
if newPropertySet == nil {
newValue = nil
} else {
newValue = newPropertySet
}
} else {
newValue, newTag = transformer.transformProperty(name, value, tag)
}
@@ -88,6 +93,14 @@ func (s *bpPropertySet) transform(transformer bpPropertyTransformer) {
s.order = newOrder
}
func transformPropertySet(transformer bpPropertyTransformer, name string, propertySet *bpPropertySet, tag android.BpPropertyTag) (*bpPropertySet, android.BpPropertyTag) {
newPropertySet, newTag := transformer.transformPropertySet(name, propertySet, tag)
if newPropertySet != nil {
newPropertySet.transformContents(transformer)
}
return newPropertySet, newTag
}
func (s *bpPropertySet) setProperty(name string, value interface{}) {
if s.properties[name] == nil {
s.AddProperty(name, value)
@@ -180,8 +193,7 @@ func (m *bpModule) deepCopy() *bpModule {
func (m *bpModule) transform(transformer bpTransformer) *bpModule {
transformedModule := transformer.transformModule(m)
// Copy the contents of the returned property set into the module and then transform that.
transformedModule.bpPropertySet, _ = transformer.transformPropertySet("", transformedModule.bpPropertySet, nil)
transformedModule.bpPropertySet.transform(transformer)
transformedModule.bpPropertySet, _ = transformPropertySet(transformer, "", transformedModule.bpPropertySet, nil)
return transformedModule
}
@@ -253,10 +265,19 @@ func (f *bpFile) AddModule(module android.BpModule) {
}
func (f *bpFile) newModule(moduleType string) *bpModule {
return newModule(moduleType)
}
func newModule(moduleType string) *bpModule {
module := &bpModule{
moduleType: moduleType,
bpPropertySet: &bpPropertySet{},
bpPropertySet: newPropertySet(),
}
module.bpPropertySet.init()
return module
}
func newPropertySet() *bpPropertySet {
set := &bpPropertySet{}
set.init()
return set
}