StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2020-02-21 08:18:25 +00:00
committed by Gerrit Code Review
parent 1a9be9f3d0 583bf7ebf7
commit 1c1c6ab46b
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sdk/sdk.go
View File

@@ -320,10 +320,12 @@ func (t sdkMemberVersionedDepTag) ExcludeFromVisibilityEnforcement() {}
// Step 1: create dependencies from an SDK module to its members. // Step 1: create dependencies from an SDK module to its members.
func memberMutator(mctx android.BottomUpMutatorContext) { func memberMutator(mctx android.BottomUpMutatorContext) {
if s, ok := mctx.Module().(*sdk); ok { if s, ok := mctx.Module().(*sdk); ok {
for _, memberListProperty := range s.memberListProperties() { if s.Enabled() {
names := memberListProperty.getter(s.dynamicMemberTypeListProperties) for _, memberListProperty := range s.memberListProperties() {
tag := memberListProperty.dependencyTag names := memberListProperty.getter(s.dynamicMemberTypeListProperties)
memberListProperty.memberType.AddDependencies(mctx, tag, names) tag := memberListProperty.dependencyTag
memberListProperty.memberType.AddDependencies(mctx, tag, names)
}
} }
} }
} }