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/aconfig/codegen/aconfig_declarations_group.go b/aconfig/codegen/aconfig_declarations_group.go
index 13daf47..6811d06 100644
--- a/aconfig/codegen/aconfig_declarations_group.go
+++ b/aconfig/codegen/aconfig_declarations_group.go
@@ -59,7 +59,7 @@
func AconfigDeclarationsGroupFactory() android.Module {
module := &AconfigDeclarationsGroup{}
module.AddProperties(&module.properties)
- android.InitAndroidModule(module)
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module)
return module
}
diff --git a/aconfig/codegen/aconfig_declarations_group_test.go b/aconfig/codegen/aconfig_declarations_group_test.go
index c69d21f..ef954ce 100644
--- a/aconfig/codegen/aconfig_declarations_group_test.go
+++ b/aconfig/codegen/aconfig_declarations_group_test.go
@@ -67,7 +67,7 @@
`)
// Check if aconfig_declarations_group module depends on the aconfig_library modules
- java.CheckModuleDependencies(t, result.TestContext, "my_group", "", []string{
+ java.CheckModuleDependencies(t, result.TestContext, "my_group", "android_common", []string{
`bar-java`,
`foo-java`,
})