From 0f7d2ef3ac3b1875fab0fe721224ee22893ed194 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 16 Oct 2019 11:03:10 -0700 Subject: Add method to determine variations from a Target The arch variants are hardcoded in every module type. Refactor them out into a Target.Variations() method in preparation for splitting the arch mutator into two, which will require using different variations. Test: m checkbuild Change-Id: I28ef7cd5168095ac888fe77f04e27f9ad81978c0 --- java/java.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 4264ba908..47fb1a7be 100644 --- a/java/java.go +++ b/java/java.go @@ -546,9 +546,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { ctx.AddVariationDependencies(nil, libTag, j.properties.Libs...) ctx.AddVariationDependencies(nil, staticLibTag, j.properties.Static_libs...) - ctx.AddFarVariationDependencies([]blueprint.Variation{ - {Mutator: "arch", Variation: ctx.Config().BuildOsCommonVariant}, - }, pluginTag, j.properties.Plugins...) + ctx.AddFarVariationDependencies(ctx.Config().BuildOSCommonTarget.Variations(), pluginTag, j.properties.Plugins...) android.ProtoDeps(ctx, &j.protoProperties) if j.hasSrcExt(".proto") { -- cgit v1.2.3-59-g8ed1b