From a1ad8d1889e81be97b98f19969ed9147094f199c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 1 Jun 2016 17:09:44 -0700 Subject: Simplify arch target handling Soong's multi-architecture building has grown complex, with the combination of HostOrDevice+HostType+Arch necessary to determine how to build a variant of a module, and three separate mutators to split each into its variations. Combine HostOrDevice+HostType into Os, which will be Linux, Darwin, Windows, or Android. Store Os+Arch as a single Target. Change-Id: I92f2e2dac53617d595a35cc285d2bd348baa0fbd --- genrule/genrule.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'genrule') diff --git a/genrule/genrule.go b/genrule/genrule.go index a195b24f..a50af1c6 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -97,8 +97,7 @@ func genruleDepsMutator(ctx android.BottomUpMutatorContext) { if g, ok := ctx.Module().(*generator); ok { if g.properties.Tool != "" { ctx.AddFarVariationDependencies([]blueprint.Variation{ - {"host_or_device", android.Host.String()}, - {"host_type", android.CurrentHostType().String()}, + {"arch", ctx.AConfig().BuildOsVariant}, }, nil, g.properties.Tool) } } -- cgit v1.2.3