diff options
| author | Colin Cross <ccross@android.com> | 2016-06-01 17:09:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-06-02 19:09:32 -0700 |
| commit | a1ad8d1889e81be97b98f19969ed9147094f199c (patch) | |
| tree | dada5b2274c750ccd8e7f5ad85b13e3922c2cc61 /genrule/genrule.go | |
| parent | b9db480385745a9f42ea3f49a16877cb048960a9 (diff) | |
| download | build_soong-a1ad8d1889e81be97b98f19969ed9147094f199c.tar.gz build_soong-a1ad8d1889e81be97b98f19969ed9147094f199c.tar.bz2 build_soong-a1ad8d1889e81be97b98f19969ed9147094f199c.zip | |
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
Diffstat (limited to 'genrule/genrule.go')
| -rw-r--r-- | genrule/genrule.go | 3 |
1 files changed, 1 insertions, 2 deletions
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) } } |