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

Merge changes I32bc93e0,I7ec47dbc am: dd72d689e7

Browse Source 
Change-Id: Icaaa8deaa2ff925e9fa196d7302821cff0d62e5d
This commit is contained in:
Automerger Merge Worker
2020-02-28 11:28:09 +00:00
parent 902afd2dbe dd72d689e7
commit bf3da2c758
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/sdk.go
View File

@@ -323,8 +323,10 @@ func memberMutator(mctx android.BottomUpMutatorContext) {
if s.Enabled() {
for _, memberListProperty := range s.memberListProperties() {
names := memberListProperty.getter(s.dynamicMemberTypeListProperties)
tag := memberListProperty.dependencyTag
memberListProperty.memberType.AddDependencies(mctx, tag, names)
if len(names) > 0 {
tag := memberListProperty.dependencyTag
memberListProperty.memberType.AddDependencies(mctx, tag, names)
}
}
}
}

6
sdk/testing.go
View File

@@ -61,6 +61,12 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr
config := android.TestArchConfig(buildDir, nil, bp, mockFS)
// Add windows as a default disable OS to test behavior when some OS variants
// are disabled.
config.Targets[android.Windows] = []android.Target{
{android.Windows, android.Arch{ArchType: android.X86_64}, android.NativeBridgeDisabled, "", ""},
}
ctx := android.NewTestArchContext()
// from android package