diff options
| author | 2019-11-19 19:44:10 +0000 | |
|---|---|---|
| committer | 2020-01-30 11:45:47 +0000 | |
| commit | f8539922d487217e6d41a44ea95e8829a4340c92 (patch) | |
| tree | e0ceeac05fd691dcecce22a58cca2245152e393a /sdk/sdk.go | |
| parent | 5b511a200ef62e9078aee856b5f9c14a6e26e3b7 (diff) | |
Make sdkMemberDependencyTag usable outside sdk package
Moves the struct to android/sdk.go and abstracts it behind a factory
method and interface. That allows it to be used outside the sdk
package.
This change is in preparation for adding support for module types that
have transitive sdk members.
Bug: 142940300
Test: m nothing
Change-Id: I71e5e0adf839b28a3a0952f82637637887f02688
Diffstat (limited to 'sdk/sdk.go')
| -rw-r--r-- | sdk/sdk.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go index 3b0752ff7..f22763c10 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -65,11 +65,6 @@ type sdkProperties struct { Module_exports bool `blueprint:"mutated"` } -type sdkMemberDependencyTag struct { - blueprint.BaseDependencyTag - memberType android.SdkMemberType -} - // Contains information about the sdk properties that list sdk members, e.g. // Java_header_libs. type sdkMemberListProperty struct { @@ -81,7 +76,7 @@ type sdkMemberListProperty struct { // the dependency tag used for items in this list that can be used to determine the memberType // for a resolved dependency. - dependencyTag *sdkMemberDependencyTag + dependencyTag android.SdkMemberTypeDependencyTag } func (p *sdkMemberListProperty) propertyName() string { @@ -167,9 +162,7 @@ func createDynamicSdkMemberTypes(sdkMemberTypes []android.SdkMemberType) *dynami memberType: memberType, - dependencyTag: &sdkMemberDependencyTag{ - memberType: memberType, - }, + dependencyTag: android.DependencyTagForSdkMemberType(memberType), } listProperties = append(listProperties, memberListProperty) |