From 30c830b82ae80642dff69c39b1fdb2bfb8a82984 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 22 Sep 2021 11:49:47 +0100 Subject: Removes usages of SdkMemberTrait/TypeRegistry outside android/sdk.go In preparation for a refactoring that will dedup the registry code. Bug: 195754365 Test: m nothing Change-Id: I93e8485d588f5b4d6b5e2967da5dbef7b6c831ad --- sdk/sdk.go | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'sdk/sdk.go') diff --git a/sdk/sdk.go b/sdk/sdk.go index 949a4b4f8..84c9a96e4 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -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() -- cgit v1.2.3-59-g8ed1b