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" am: 1c1c6ab46b am: 63f0e96c10

Browse Source 
Change-Id: I9fff6ffdda1d23a111159b4f7a17611943d854c4
This commit is contained in:
Automerger Merge Worker
2020-02-21 08:51:39 +00:00
parent 9f3946121e 63f0e96c10
commit ad22da0dcb
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)
}
} }
} }
} }