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

Merge "Use alias for test_per_src apex dependencies"

Browse Source
This commit is contained in:
Colin Cross
2020-09-12 20:21:36 +00:00
committed by Gerrit Code Review
parent 2c033610e2 90dab3498d
commit a018b3df16
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -1450,8 +1450,6 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
binVariations := target.Variations() binVariations := target.Variations()
libVariations := append(target.Variations(), libVariations := append(target.Variations(),
blueprint.Variation{Mutator: "link", Variation: "shared"}) blueprint.Variation{Mutator: "link", Variation: "shared"})
testVariations := append(target.Variations(),
blueprint.Variation{Mutator: "test_per_src", Variation: ""}) // "" is the all-tests variant
if ctx.Device() { if ctx.Device() {
binVariations = append(binVariations, binVariations = append(binVariations,
@@ -1459,8 +1457,6 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
libVariations = append(libVariations, libVariations = append(libVariations,
blueprint.Variation{Mutator: "image", Variation: imageVariation}, blueprint.Variation{Mutator: "image", Variation: imageVariation},
blueprint.Variation{Mutator: "version", Variation: ""}) // "" is the non-stub variant blueprint.Variation{Mutator: "version", Variation: ""}) // "" is the non-stub variant
testVariations = append(testVariations,
blueprint.Variation{Mutator: "image", Variation: imageVariation})
} }
ctx.AddFarVariationDependencies(libVariations, sharedLibTag, nativeModules.Native_shared_libs...) ctx.AddFarVariationDependencies(libVariations, sharedLibTag, nativeModules.Native_shared_libs...)
@@ -1469,7 +1465,7 @@ func addDependenciesForNativeModules(ctx android.BottomUpMutatorContext,
ctx.AddFarVariationDependencies(binVariations, executableTag, nativeModules.Binaries...) ctx.AddFarVariationDependencies(binVariations, executableTag, nativeModules.Binaries...)
ctx.AddFarVariationDependencies(testVariations, testTag, nativeModules.Tests...) ctx.AddFarVariationDependencies(binVariations, testTag, nativeModules.Tests...)
} }
func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) { func (a *apexBundle) combineProperties(ctx android.BottomUpMutatorContext) {

1
cc/test.go
View File

@@ -223,6 +223,7 @@ func TestPerSrcMutator(mctx android.BottomUpMutatorContext) {
tests[i].(*Module).linker.(testPerSrc).setSrc(testNames[i], src) tests[i].(*Module).linker.(testPerSrc).setSrc(testNames[i], src)
mctx.AddInterVariantDependency(testPerSrcDepTag, all_tests, tests[i]) mctx.AddInterVariantDependency(testPerSrcDepTag, all_tests, tests[i])
} }
mctx.AliasVariation("")
} }
} }
} }