summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-10-17 18:52:20 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-10-17 18:52:20 +0000
commitad4a597c79a70e84a045c5d2ed15c4a1e3d6641a (patch)
tree55dc905b0b20930173a890f7b372774d22d1cbf6 /java/java.go
parenta8f91ec00d12bb47890bc2c5d29467e5a52f8144 (diff)
parent0f7d2ef3ac3b1875fab0fe721224ee22893ed194 (diff)
Merge "Add method to determine variations from a Target"
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/java/java.go b/java/java.go
index 52f3c11aa..3b95f1e47 100644
--- a/java/java.go
+++ b/java/java.go
@@ -551,9 +551,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") {