Merge "Add defaults support for apex_contributions module type" into main (66e8a757) · Commits · e / os / android_build_soong

android/apex_contributions.go

+15 −0

Original line number	Diff line number	Diff line
		@@ -27,11 +27,13 @@ func init() {

		func RegisterApexContributionsBuildComponents(ctx RegistrationContext) {
		ctx.RegisterModuleType("apex_contributions", apexContributionsFactory)
		ctx.RegisterModuleType("apex_contributions_defaults", apexContributionsDefaultsFactory)
		ctx.RegisterSingletonModuleType("all_apex_contributions", allApexContributionsFactory)
		}

		type apexContributions struct {
		ModuleBase
		DefaultableModuleBase
		properties contributionProps
		}

		@@ -61,6 +63,7 @@ func apexContributionsFactory() Module {
		module := &apexContributions{}
		module.AddProperties(&module.properties)
		InitAndroidModule(module)
		InitDefaultableModule(module)
		return module
		}

		@@ -70,6 +73,18 @@ func apexContributionsFactory() Module {
		func (m *apexContributions) GenerateAndroidBuildActions(ctx ModuleContext) {
		}

		type apexContributionsDefaults struct {
		ModuleBase
		DefaultsModuleBase
		}

		func apexContributionsDefaultsFactory() Module {
		module := &apexContributionsDefaults{}
		module.AddProperties(&contributionProps{})
		InitDefaultsModule(module)
		return module
		}

		// A container for apex_contributions.
		// Based on product_config, it will create a dependency on the selected
		// apex_contributions per mainline module