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`,
})
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 {
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 1d2f3fb..645778b 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -82,14 +82,6 @@
return files.AddToFixture()
}
-func withTargets(targets map[android.OsType][]android.Target) android.FixturePreparer {
- return android.FixtureModifyConfig(func(config android.Config) {
- for k, v := range targets {
- config.Targets[k] = v
- }
- })
-}
-
// withNativeBridgeTargets sets configuration with targets including:
// - X86_64 (primary)
// - X86 (secondary)
@@ -4051,11 +4043,20 @@
"libvndk27binder32.so": nil,
}),
withBinder32bit,
- withTargets(map[android.OsType][]android.Target{
- android.Android: {
- {Os: android.Android, Arch: android.Arch{ArchType: android.Arm, ArchVariant: "armv7-a-neon", Abi: []string{"armeabi-v7a"}},
- NativeBridge: android.NativeBridgeDisabled, NativeBridgeHostArchName: "", NativeBridgeRelativePath: ""},
- },
+ android.FixtureModifyConfig(func(config android.Config) {
+ target := android.Target{
+ Os: android.Android,
+ Arch: android.Arch{
+ ArchType: android.Arm,
+ ArchVariant: "armv7-a-neon",
+ Abi: []string{"armeabi-v7a"},
+ },
+ NativeBridge: android.NativeBridgeDisabled,
+ NativeBridgeHostArchName: "",
+ NativeBridgeRelativePath: "",
+ }
+ config.Targets[android.Android] = []android.Target{target}
+ config.AndroidFirstDeviceTarget = target
}),
)
diff --git a/apex/vndk.go b/apex/vndk.go
index 5e630c0..d88808b 100644
--- a/apex/vndk.go
+++ b/apex/vndk.go
@@ -95,7 +95,11 @@
// level for the primary architecture.
a.Disable()
} else {
- mctx.AddDependency(mctx.Module(), prebuiltTag, cc.VndkLibrariesTxtModules(vndkVersion, mctx)...)
+ mctx.AddVariationDependencies(
+ mctx.Config().AndroidFirstDeviceTarget.Variations(),
+ prebuiltTag,
+ cc.VndkLibrariesTxtModules(vndkVersion, mctx)...,
+ )
}
}
}
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index d75a4a2..7db70e8 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -49,7 +49,7 @@
func filesystemCreatorFactory() android.Module {
module := &filesystemCreator{}
- android.InitAndroidModule(module)
+ android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
module.AddProperties(&module.properties)
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
module.createInternalModules(ctx)
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 5c69ff1..14e201a 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -1442,7 +1442,7 @@
func (dbj *artBootImages) DepsMutator(ctx android.BottomUpMutatorContext) {
// Create a dependency on `dex_bootjars` to access the intermediate locations of host art boot image.
- ctx.AddDependency(ctx.Module(), dexpreoptBootJarDepTag, "dex_bootjars")
+ ctx.AddVariationDependencies(ctx.Config().AndroidCommonTarget.Variations(), dexpreoptBootJarDepTag, "dex_bootjars")
}
func (d *artBootImages) GenerateAndroidBuildActions(ctx android.ModuleContext) {