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
This commit is contained in:
Colin Cross
2016-06-01 17:09:44 -07:00
parent b9db480385
commit a1ad8d1889
19 changed files with 366 additions and 476 deletions

View File

@@ -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)
}
}