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

Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go

Browse Source 
In preparation for a refactoring that will dedup the registry code.

Bug: 195754365
Test: m nothing
Change-Id: I93e8485d588f5b4d6b5e2967da5dbef7b6c831ad
This commit is contained in:
Paul Duffin
2021-09-22 11:49:47 +01:00
parent 93b750e2a0
commit 30c830b82a
4 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sdk/sdk.go
View File

@@ -111,19 +111,14 @@ func newSdkModule(moduleExports bool) *sdk {
s := &sdk{}
s.properties.Module_exports = moduleExports
// Get the dynamic sdk member type data for the currently registered sdk member types.
var typeRegistry *android.SdkMemberTypesRegistry
if moduleExports {
typeRegistry = android.ModuleExportsMemberTypes
} else {
typeRegistry = android.SdkMemberTypes
}
s.dynamicSdkMemberTypes = getDynamicSdkMemberTypes(typeRegistry)
sdkMemberTypeKey, sdkMemberTypes := android.RegisteredSdkMemberTypes(moduleExports)
s.dynamicSdkMemberTypes = getDynamicSdkMemberTypes(sdkMemberTypeKey, sdkMemberTypes)
// Create an instance of the dynamically created struct that contains all the
// properties for the member type specific list properties.
s.dynamicMemberTypeListProperties = s.dynamicSdkMemberTypes.createMemberTypeListProperties()
traitRegistry := android.RegisteredSdkMemberTraits
s.dynamicSdkMemberTraits = getDynamicSdkMemberTraits(traitRegistry)
sdkMemberTraitsKey, sdkMemberTraits := android.RegisteredSdkMemberTraits()
s.dynamicSdkMemberTraits = getDynamicSdkMemberTraits(sdkMemberTraitsKey, sdkMemberTraits)
// Create an instance of the dynamically created struct that contains all the properties for the
// member trait specific list properties.
s.dynamicMemberTraitListProperties = s.dynamicSdkMemberTraits.createMemberTraitListProperties()