From b9db480385745a9f42ea3f49a16877cb048960a9 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 3 Jun 2016 01:50:47 +0000 Subject: Revert "Simplify arch target handling" This reverts commit 6713fb26cbcadf525cd75e47d7d0cbc23d282b3e. Change-Id: Ic473cea2563b0b37dc08b0bc5d3a0ac8c4b6afe6 --- genrule/genrule.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'genrule/genrule.go') diff --git a/genrule/genrule.go b/genrule/genrule.go index a50af1c6..a195b24f 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -97,7 +97,8 @@ func genruleDepsMutator(ctx android.BottomUpMutatorContext) { if g, ok := ctx.Module().(*generator); ok { if g.properties.Tool != "" { ctx.AddFarVariationDependencies([]blueprint.Variation{ - {"arch", ctx.AConfig().BuildOsVariant}, + {"host_or_device", android.Host.String()}, + {"host_type", android.CurrentHostType().String()}, }, nil, g.properties.Tool) } } -- cgit v1.2.3