Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63f0e96c authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: I352ae417ed60378f205f9c2358e63699f512a27b
parents c40208d7 1c1c6ab4

sdk/sdk.go

+6 −4
Original line number Diff line number Diff line
@@ -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) {