Ensure that *bootclasspath* module types depend on device variants

Needed to allow change https://r.android.com/2089503 to be reapplied.

Bug: 232106778
Test: Apply the change and then run
      m EMMA_INSTRUMENT=true nothing
Change-Id: I92d19c51cc828295ba13951e65911db707f0f2ba
This commit is contained in:
Paul Duffin
2022-05-11 14:29:53 +00:00
parent f923333a93
commit b2c2173bfd
3 changed files with 5 additions and 1 deletions

View File

@@ -84,6 +84,9 @@ func addDependencyOntoApexModulePair(ctx android.BottomUpMutatorContext, apex st
}
}
target := ctx.Module().Target()
variations = append(variations, target.Variations()...)
addedDep := false
if ctx.OtherModuleDependencyVariantExists(variations, name) {
ctx.AddFarVariationDependencies(variations, tag, name)