From 471d068893102bce50dead6688219acb23679c1b Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Wed, 6 Mar 2024 14:47:08 +0000 Subject: Add defaults support for apex_contributions module type Bug: 326246905 Test: go build ./android Change-Id: I8be21594465d81c99c216b0fcbf9996aed46c209 --- android/apex_contributions.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'android/apex_contributions.go') diff --git a/android/apex_contributions.go b/android/apex_contributions.go index 89e27b97b..c1216c69b 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -25,11 +25,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 } @@ -59,6 +61,7 @@ func apexContributionsFactory() Module { module := &apexContributions{} module.AddProperties(&module.properties) InitAndroidModule(module) + InitDefaultableModule(module) return module } @@ -68,6 +71,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 -- cgit v1.2.3-59-g8ed1b