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

Commit ceaff1ca authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Add combined_api_defaults module type" into main am: 364446fa 

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



Change-Id: I09631f82720ba587b42d8905f61495d52fcf4577
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7a821120 364446fa

api/api.go

+16 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ type CombinedApisProperties struct { 


type CombinedApis struct {

	android.ModuleBase

	android.DefaultableModuleBase



	properties CombinedApisProperties

}
@@ -74,6 +75,7 @@ func init() { 


func registerBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("combined_apis", combinedApisModuleFactory)

	ctx.RegisterModuleType("combined_apis_defaults", CombinedApisModuleDefaultsFactory)

}



var PrepareForCombinedApisTest = android.FixtureRegisterWithContext(registerBuildComponents)
@@ -409,6 +411,7 @@ 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

}
@@ -445,3 +448,16 @@ 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

}