Merge "Add method to determine variations from a Target"

2019-10-17 18:52:20 +00:00
parent a8f91ec00d 0f7d2ef3ac
commit ad4a597c79
15 changed files with 92 additions and 99 deletions
--- 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...)
 		}
 	}
 }