Create fewer empty version variants
Don't create empty version variants for binaries, objects, rust rlibs or rust dylibs. Test: no change to build.ninja Change-Id: I62d4d43da476eafdb258a08b5ada758bb2971a1a
This commit is contained in:
@@ -40,19 +40,14 @@ type binarySdkMemberType struct {
|
||||
|
||||
func (mt *binarySdkMemberType) AddDependencies(mctx android.BottomUpMutatorContext, dependencyTag blueprint.DependencyTag, names []string) {
|
||||
targets := mctx.MultiTargets()
|
||||
for _, lib := range names {
|
||||
for _, bin := range names {
|
||||
for _, target := range targets {
|
||||
name, version := StubsLibNameAndVersion(lib)
|
||||
if version == "" {
|
||||
version = "latest"
|
||||
}
|
||||
variations := target.Variations()
|
||||
if mctx.Device() {
|
||||
variations = append(variations,
|
||||
blueprint.Variation{Mutator: "image", Variation: android.CoreVariation},
|
||||
blueprint.Variation{Mutator: "version", Variation: version})
|
||||
blueprint.Variation{Mutator: "image", Variation: android.CoreVariation})
|
||||
}
|
||||
mctx.AddFarVariationDependencies(variations, dependencyTag, name)
|
||||
mctx.AddFarVariationDependencies(variations, dependencyTag, bin)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user