Remove dependencies on the 1-variant fallback

Currently, adding depedencies will use the only variant of a module
if only 1 variant exists. Otherwise, the variations of the two modules
+ the variations explicitly requested must match. The 1-variant
fallback causes issues for incremental soong, so remove reliances on it.

Bug: 372091092
Test: m nothing --no-skip-soong-tests
Change-Id: I778d1d8d67e9d0ccc3432f12e50d15c174b5dbf5

1 files changed, 1 insertions, 1 deletions

diff --git a/api/api.go b/api/api.go
index e9f1feebd899..1bbf3709480a 100644
--- a/api/api.go
+++ b/api/api.go
@@ -514,7 +514,7 @@ func (a *CombinedApis) createInternalModules(ctx android.LoadHookContext) {
 func combinedApisModuleFactory() android.Module {
 	module := &CombinedApis{}
 	module.AddProperties(&module.properties)
-	android.InitAndroidModule(module)
+	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) { module.createInternalModules(ctx) })
 	return module
 }