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

Use Module.GetProperties() instead of ModuleBase.generalProperties

Browse Source 
ModuleBase.generalProperties served the pupose of being a subset
of ModuleBase.customizableProperties. But now with the removal of
the latter, the former is simply a redirection to Module.GetProperties()

Bug: 206961391
Test: m nothing and diff the ninja files
Change-Id: I6dd8b7ba74eb5e7ffb61029b0f9129eec2ccfdaf
This commit is contained in:
Usta
2022-01-05 23:42:33 -05:00
committed by Usta Shrestha
parent e508f6a50b
commit 851a3271ce
10 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/module.go
View File

@@ -1032,8 +1032,6 @@ func InitAndroidModule(m Module) {
initProductVariableModule(m)
base.generalProperties = m.GetProperties()
// The default_visibility property needs to be checked and parsed by the visibility module during
// its checking and parsing phases so make it the primary visibility property.
setPrimaryVisibilityProperty(m, "visibility", &base.commonProperties.Visibility)
@@ -1207,13 +1205,12 @@ type ModuleBase struct {
distProperties distProperties
variableProperties interface{}
hostAndDeviceProperties hostAndDeviceProperties
generalProperties []interface{}
// Arch specific versions of structs in generalProperties. The outer index
// has the same order as generalProperties as initialized in
// InitAndroidArchModule, and the inner index chooses the props specific to
// the architecture. The interface{} value is an archPropRoot that is
// filled with arch specific values by the arch mutator.
// Arch specific versions of structs in GetProperties() prior to
// initialization in InitAndroidArchModule, lets call it `generalProperties`.
// The outer index has the same order as generalProperties and the inner index
// chooses the props specific to the architecture. The interface{} value is an
// archPropRoot that is filled with arch specific values by the arch mutator.
archProperties [][]interface{}
// Properties specific to the Blueprint to BUILD migration.