diff --git a/genrule/genrule.go b/genrule/genrule.go
index a50af1c..a195b24 100644
--- a/genrule/genrule.go
+++ b/genrule/genrule.go
@@ -97,7 +97,8 @@
 	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)
 		}
 	}