diff options
| author | Colin Cross <ccross@android.com> | 2016-06-01 17:09:44 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-06-02 17:37:02 -0700 |
| commit | 54c7112c4325426eabda5fa96a8d3c4f61cb8cc7 (patch) | |
| tree | bc8a80430fa87b0f772e04430f2c96dcd4a85482 /genrule | |
| parent | 0fda89f4a80223d0adb01e0f44a0575c83956ea0 (diff) | |
| download | build_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.tar.gz build_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.tar.bz2 build_soong-54c7112c4325426eabda5fa96a8d3c4f61cb8cc7.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: Iae677eff61a851b65a7192a47f2dc17c1abb4160
Diffstat (limited to 'genrule')
| -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) } } |