Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebb7fb76 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove combined_apis_defaults module type" into main am: fd3466c4 am: 79298b6f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3184524



Change-Id: Ia804926bee29a8c16e76e55817efbbc0790876c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0653ba58 79298b6f

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

}