diff options
| author | 2020-08-21 16:15:23 -0700 | |
|---|---|---|
| committer | 2020-08-26 11:51:51 -0700 | |
| commit | 42507337e52b14dc3fd50b20b61af32248273d73 (patch) | |
| tree | d271bff8f8084a63b1b7049d0ccda6b5668f3269 /cc/binary_sdk_member.go | |
| parent | 1ec1255476c46623a6973780793a2497b163ab1a (diff) | |
Only request image and version variations for device SDK dependencies
AddFarVariationDependencies was broken, which allowed sdk modules to
request dependencies using image and version variations, even for
host modules that do not have image or version variations. Make
the image and version variations conditional on device sdk modules.
Test: go test ./sdk
Change-Id: I59b7a32a3782254fd5feb828a5258ee13d4db812
Diffstat (limited to 'cc/binary_sdk_member.go')
| -rw-r--r-- | cc/binary_sdk_member.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cc/binary_sdk_member.go b/cc/binary_sdk_member.go index 337de55b3..a1abc728a 100644 --- a/cc/binary_sdk_member.go +++ b/cc/binary_sdk_member.go @@ -46,9 +46,13 @@ func (mt *binarySdkMemberType) AddDependencies(mctx android.BottomUpMutatorConte if version == "" { version = LatestStubsVersionFor(mctx.Config(), name) } - mctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{ - {Mutator: "version", Variation: version}, - }...), dependencyTag, name) + variations := target.Variations() + if mctx.Device() { + variations = append(variations, + blueprint.Variation{Mutator: "image", Variation: android.CoreVariation}, + blueprint.Variation{Mutator: "version", Variation: version}) + } + mctx.AddFarVariationDependencies(variations, dependencyTag, name) } } } |