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/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
}),
)