diff options
| author | 2020-09-30 15:34:40 -0700 | |
|---|---|---|
| committer | 2020-10-05 18:57:21 -0700 | |
| commit | 3146c5cd67f728375aa9bdfa3b0643895a32411e (patch) | |
| tree | 846d6331fb7f8ca7fd332eefa5615c3d25d02de2 /cc/binary_sdk_member.go | |
| parent | 1348ce3f1399ce7cf51dec139e1292846975e953 (diff) | |
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
Diffstat (limited to 'cc/binary_sdk_member.go')
| -rw-r--r-- | cc/binary_sdk_member.go | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cc/binary_sdk_member.go b/cc/binary_sdk_member.go index 55e400e8e..ebf89eaec 100644 --- a/cc/binary_sdk_member.go +++ b/cc/binary_sdk_member.go @@ -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) } } } |