Merge "Do not add dependencies from disabled sdk variants to its members"

sdk/sdk.go

@@ -320,6 +320,7 @@ func (t sdkMemberVersionedDepTag) ExcludeFromVisibilityEnforcement() {}
 // Step 1: create dependencies from an SDK module to its members.
 func memberMutator(mctx android.BottomUpMutatorContext) {
 	if s, ok := mctx.Module().(*sdk); ok {
+		if s.Enabled() {
 			for _, memberListProperty := range s.memberListProperties() {
 				names := memberListProperty.getter(s.dynamicMemberTypeListProperties)
 				tag := memberListProperty.dependencyTag
@@ -327,6 +328,7 @@ func memberMutator(mctx android.BottomUpMutatorContext) {
 			}
 		}
 	}
+}
 
 // Step 2: record that dependencies of SDK modules are members of the SDK modules
 func memberDepsMutator(mctx android.TopDownMutatorContext) {