From 910d78e869ab6dc2a183dd8e6c7743c7cb3fd1ac Mon Sep 17 00:00:00 2001
From: Jihoon Kang <jihoonkang@google.com>
Date: Fri, 19 Jul 2024 21:54:27 +0000
Subject: Remove combined_apis_defaults module type

This change removes the combined_apis_defaults module type, given that
combined_apis module type is not defaultable as it creates a default
module in its module factory. The only usage of this module type has
been removed with https://r.android.com/3184819 .

Test: m nothing --no-skip-soong-tests
Bug: 349800749
Change-Id: Ib78eb965124b2c80e871b1bc022011843ebaab9a
---
 api/api.go | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'api/api.go')

diff --git a/api/api.go b/api/api.go
index d4db49e90a01..ce7b7993d212 100644
--- a/api/api.go
+++ b/api/api.go
@@ -63,7 +63,6 @@ type CombinedApisProperties struct {
 
 type CombinedApis struct {
 	android.ModuleBase
-	android.DefaultableModuleBase
 
 	properties CombinedApisProperties
 }
@@ -74,7 +73,6 @@ func init() {
 
 func registerBuildComponents(ctx android.RegistrationContext) {
 	ctx.RegisterModuleType("combined_apis", combinedApisModuleFactory)
-	ctx.RegisterModuleType("combined_apis_defaults", CombinedApisModuleDefaultsFactory)
 }
 
 var PrepareForCombinedApisTest = android.FixtureRegisterWithContext(registerBuildComponents)
@@ -568,7 +566,6 @@ func combinedApisModuleFactory() android.Module {
 	module := &CombinedApis{}
 	module.AddProperties(&module.properties)
 	android.InitAndroidModule(module)
-	android.InitDefaultableModule(module)
 	android.AddLoadHook(module, func(ctx android.LoadHookContext) { module.createInternalModules(ctx) })
 	return module
 }
@@ -605,16 +602,3 @@ func remove(s []string, v string) []string {
 	}
 	return s2
 }
-
-// Defaults
-type CombinedApisModuleDefaults struct {
-	android.ModuleBase
-	android.DefaultsModuleBase
-}
-
-func CombinedApisModuleDefaultsFactory() android.Module {
-	module := &CombinedApisModuleDefaults{}
-	module.AddProperties(&CombinedApisProperties{})
-	android.InitDefaultsModule(module)
-	return module
-}
-- 
cgit v1.2.3-59-g8ed1b