diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go
index 7da1fde3..a6b2dd14 100644
--- a/build/soong/generator/generator.go
+++ b/build/soong/generator/generator.go
@@ -121,9 +121,8 @@ func (g *Module) DepsMutator(ctx android.BottomUpMutatorContext) {
 	android.ExtractSourcesDeps(ctx, g.properties.Tool_files)
 	if g, ok := ctx.Module().(*Module); ok {
 		if len(g.properties.Tools) > 0 {
-			ctx.AddFarVariationDependencies([]blueprint.Variation{
-				{"arch", ctx.Config().BuildOsVariant},
-			}, hostToolDepTag, g.properties.Tools...)
+			ctx.AddFarVariationDependencies(ctx.Config().BuildOSTarget.Variations(),
+				hostToolDepTag, g.properties.Tools...)
 		}
 	}
 }