Remove dependencies on 1-variant fallback
This is just a first pass, there are still more issues to tackle.
But after this we start getting errors about genrules which require
more work to resolve, so I'll handle them in a separate cl.
Bug: 372091092
Test: m nothing --no-skip-soong-tests
Change-Id: Ibf8f6bca699ff7c3232495ae7fa2666c967ba90b
diff --git a/android/module.go b/android/module.go
index 8415118..3079b07 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1066,6 +1066,11 @@
modPartition := mod.PartitionTag(deviceConfig)
for _, vintf := range vintfModules {
+ if vintf == nil {
+ // TODO(b/372091092): Remove this. Having it gives us missing dependency errors instead
+ // of nil pointer dereference errors, but we should resolve the missing dependencies.
+ continue
+ }
if vintfModule, ok := vintf.(*vintfFragmentModule); ok {
vintfPartition := vintfModule.PartitionTag(deviceConfig)
if modPartition != vintfPartition {