Merge "Do not add dependencies from disabled sdk variants to its members" am: 1c1c6ab46b am: 63f0e96c10

Change-Id: I9fff6ffdda1d23a111159b4f7a17611943d854c4

sdk/sdk.go

@@ -320,12 +320,14 @@ 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
 				memberListProperty.memberType.AddDependencies(mctx, tag, names)
 			}
 		}
+	}
 }
 
 // Step 2: record that dependencies of SDK modules are members of the SDK modules