diff options
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index e955aec15..5ced86efc 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -29,6 +29,8 @@ import ( // file will produce the rules necessary to convert each unique set of bootclasspath jars into // system modules in a runtime image using the jmod and jlink tools. +//go:generate go run ../../blueprint/gobtools/codegen/gob_gen.go + func init() { RegisterSystemModulesBuildComponents(android.InitRegistrationContext) @@ -121,6 +123,7 @@ func SystemModulesFactory() android.Module { return module } +// @auto-generate: gob type SystemModulesProviderInfo struct { // The aggregated header jars from all jars specified in the libs property. // Used when system module is added as a dependency to bootclasspath. @@ -131,6 +134,8 @@ type SystemModulesProviderInfo struct { // depset of header jars for this module and all transitive static dependencies TransitiveStaticLibsHeaderJars depset.DepSet[android.Path] + Prebuilt bool + Libs []string } var SystemModulesProvider = blueprint.NewProvider[*SystemModulesProviderInfo]() @@ -150,11 +155,21 @@ type SystemModulesProperties struct { Libs []string } +func (system *systemModulesImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { + info := system.commonBuildActions(ctx) + info.Prebuilt = true + android.SetProvider(ctx, SystemModulesProvider, info) +} + func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleContext) { + android.SetProvider(ctx, SystemModulesProvider, system.commonBuildActions(ctx)) +} + +func (system *SystemModules) commonBuildActions(ctx android.ModuleContext) *SystemModulesProviderInfo { var jars android.Paths var transitiveStaticLibsHeaderJars []depset.DepSet[android.Path] - ctx.VisitDirectDepsWithTag(systemModulesLibsTag, func(module android.Module) { + ctx.VisitDirectDepsProxyWithTag(systemModulesLibsTag, func(module android.ModuleProxy) { if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok { jars = append(jars, dep.HeaderJars...) transitiveStaticLibsHeaderJars = append(transitiveStaticLibsHeaderJars, dep.TransitiveStaticLibsHeaderJars) @@ -163,12 +178,13 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte system.outputDir, system.outputDeps = TransformJarsToSystemModules(ctx, jars) - android.SetProvider(ctx, SystemModulesProvider, &SystemModulesProviderInfo{ + return &SystemModulesProviderInfo{ HeaderJars: jars, OutputDir: system.outputDir, OutputDirDeps: system.outputDeps, TransitiveStaticLibsHeaderJars: depset.New(depset.PREORDER, nil, transitiveStaticLibsHeaderJars), - }) + Libs: system.properties.Libs, + } } // ComponentDepsMutator is called before prebuilt modules without a corresponding source module are @@ -275,12 +291,11 @@ func (mt *systemModulesSdkMemberType) AddDependencies(ctx android.SdkDependencyC ctx.AddVariationDependencies(nil, dependencyTag, names...) } -func (mt *systemModulesSdkMemberType) IsInstance(module android.Module) bool { - if _, ok := module.(*SystemModules); ok { +func (mt *systemModulesSdkMemberType) IsInstance(ctx android.ModuleContext, module android.ModuleProxy) bool { + if info, ok := android.OtherModuleProvider(ctx, module, SystemModulesProvider); ok { // A prebuilt system module cannot be added as a member of an sdk because the source and // snapshot instances would conflict. - _, ok := module.(*systemModulesImport) - return !ok + return !info.Prebuilt } return false } @@ -299,9 +314,8 @@ func (mt *systemModulesSdkMemberType) CreateVariantPropertiesStruct() android.Sd return &systemModulesInfoProperties{} } -func (p *systemModulesInfoProperties) PopulateFromVariant(ctx android.SdkMemberContext, variant android.Module) { - systemModule := variant.(*SystemModules) - p.Libs = systemModule.properties.Libs +func (p *systemModulesInfoProperties) PopulateFromVariant(ctx android.SdkMemberContext, variant android.ModuleProxy) { + p.Libs = android.OtherModulePointerProviderOrDefault(ctx.SdkModuleContext(), variant, SystemModulesProvider).Libs } func (p *systemModulesInfoProperties) AddToPropertySet(ctx android.SdkMemberContext, propertySet android.BpPropertySet) { |