Merge "Do not add dependencies from disabled sdk variants to its members" (1c1c6ab4) · Commits · e / os / android_build_soong

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) {