Merge "Remove combined_apis_defaults module type" into main (fd3466c4) · Commits · e / os / android_frameworks_base

api/api.go

+0 −16

Original line number	Diff line number	Diff line
		@@ -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)
		@@ -576,7 +574,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
		}
		@@ -613,16 +610,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
		}