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

@@ -273,7 +273,7 @@ func bootclasspathFragmentFactory() android.Module {
android.InitApexModule(m)
android.InitSdkAwareModule(m)
initClasspathFragment(m, BOOTCLASSPATH)
android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon)
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
android.AddLoadHook(m, func(ctx android.LoadHookContext) {
// If code coverage has been enabled for the framework then append the properties with