summaryrefslogtreecommitdiff
path: root/sdk/sdk.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-10-17 18:52:20 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-10-17 18:52:20 +0000
commitad4a597c79a70e84a045c5d2ed15c4a1e3d6641a (patch)
tree55dc905b0b20930173a890f7b372774d22d1cbf6 /sdk/sdk.go
parenta8f91ec00d12bb47890bc2c5d29467e5a52f8144 (diff)
parent0f7d2ef3ac3b1875fab0fe721224ee22893ed194 (diff)
Merge "Add method to determine variations from a Target"
Diffstat (limited to 'sdk/sdk.go')
-rw-r--r--sdk/sdk.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/sdk/sdk.go b/sdk/sdk.go
index d122cda56..e4d520be1 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -147,11 +147,10 @@ func memberMutator(mctx android.BottomUpMutatorContext) {
targets := mctx.MultiTargets()
for _, target := range targets {
- mctx.AddFarVariationDependencies([]blueprint.Variation{
- {Mutator: "arch", Variation: target.String()},
+ mctx.AddFarVariationDependencies(append(target.Variations(), []blueprint.Variation{
{Mutator: "image", Variation: "core"},
{Mutator: "link", Variation: "shared"},
- }, sdkMemberDepTag, m.properties.Native_shared_libs...)
+ }...), sdkMemberDepTag, m.properties.Native_shared_libs...)
}
}
}