From a720811c3813afb192ed69be0c38fac837514698 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 23 Apr 2021 21:20:20 +0100 Subject: Allow exporting of sdk members to be done per tag Previously, every module added to an sdk directly through one of the SdkMemberType specific properties, e.g. java_libs, was exported and every module added automatically via a transitive dependencies was not exported. This change allows that behavior to be customized per tag. Bug: 186290299 Test: m art-module-sdk - verify that this change does not affect its contents. Change-Id: I563b5bcd823e61c23cdb706cfcbb13337963d550 --- sdk/sdk.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'sdk/sdk.go') diff --git a/sdk/sdk.go b/sdk/sdk.go index 710c1f297..1c6002a31 100644 --- a/sdk/sdk.go +++ b/sdk/sdk.go @@ -193,7 +193,8 @@ func createDynamicSdkMemberTypes(sdkMemberTypes []android.SdkMemberType) *dynami memberType: memberType, - dependencyTag: android.DependencyTagForSdkMemberType(memberType), + // Dependencies added directly from member properties are always exported. + dependencyTag: android.DependencyTagForSdkMemberType(memberType, true), } listProperties = append(listProperties, memberListProperty) @@ -255,22 +256,6 @@ func (s *sdk) memberListProperties() []*sdkMemberListProperty { return s.dynamicSdkMemberTypes.memberListProperties } -func (s *sdk) getExportedMembers() map[string]struct{} { - // Collect all the exported members. - exportedMembers := make(map[string]struct{}) - - for _, memberListProperty := range s.memberListProperties() { - names := memberListProperty.getter(s.dynamicMemberTypeListProperties) - - // Every member specified explicitly in the properties is exported by the sdk. - for _, name := range names { - exportedMembers[name] = struct{}{} - } - } - - return exportedMembers -} - func (s *sdk) snapshot() bool { return s.properties.Snapshot } -- cgit v1.2.3-59-g8ed1b