StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove moduleInfoJSON from ModuleBase." into main

Browse Source
This commit is contained in:
Yu Liu
2024-08-28 00:32:50 +00:00
committed by Gerrit Code Review
parent 4e3486b0ba 4297ad9046
commit 713f415cde
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
android/module.go
View File

@@ -848,10 +848,6 @@ type ModuleBase struct {
// Merged Aconfig files for all transitive deps. // Merged Aconfig files for all transitive deps.
aconfigFilePaths Paths aconfigFilePaths Paths
// moduleInfoJSON can be filled out by GenerateAndroidBuildActions to write a JSON file that will
// be included in the final module-info.json produced by Make.
moduleInfoJSON *ModuleInfoJSON
// complianceMetadataInfo is for different module types to dump metadata. // complianceMetadataInfo is for different module types to dump metadata.
// See android.ModuleContext interface. // See android.ModuleContext interface.
complianceMetadataInfo *ComplianceMetadataInfo complianceMetadataInfo *ComplianceMetadataInfo
@@ -1999,7 +1995,7 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
SetProvider(ctx, InstallFilesProvider, installFiles) SetProvider(ctx, InstallFilesProvider, installFiles)
buildLicenseMetadata(ctx, ctx.licenseMetadataFile) buildLicenseMetadata(ctx, ctx.licenseMetadataFile)
if m.moduleInfoJSON != nil { if ctx.moduleInfoJSON != nil {
var installed InstallPaths var installed InstallPaths
installed = append(installed, ctx.katiInstalls.InstallPaths()...) installed = append(installed, ctx.katiInstalls.InstallPaths()...)
installed = append(installed, ctx.katiSymlinks.InstallPaths()...) installed = append(installed, ctx.katiSymlinks.InstallPaths()...)
@@ -2019,28 +2015,28 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
data = append(data, d.ToRelativeInstallPath()) data = append(data, d.ToRelativeInstallPath())
} }
if m.moduleInfoJSON.Uninstallable { if ctx.moduleInfoJSON.Uninstallable {
installedStrings = nil installedStrings = nil
if len(m.moduleInfoJSON.CompatibilitySuites) == 1 && m.moduleInfoJSON.CompatibilitySuites[0] == "null-suite" { if len(ctx.moduleInfoJSON.CompatibilitySuites) == 1 && ctx.moduleInfoJSON.CompatibilitySuites[0] == "null-suite" {
m.moduleInfoJSON.CompatibilitySuites = nil ctx.moduleInfoJSON.CompatibilitySuites = nil
m.moduleInfoJSON.TestConfig = nil ctx.moduleInfoJSON.TestConfig = nil
m.moduleInfoJSON.AutoTestConfig = nil ctx.moduleInfoJSON.AutoTestConfig = nil
data = nil data = nil
} }
} }
m.moduleInfoJSON.core = CoreModuleInfoJSON{ ctx.moduleInfoJSON.core = CoreModuleInfoJSON{
RegisterName: m.moduleInfoRegisterName(ctx, m.moduleInfoJSON.SubName), RegisterName: m.moduleInfoRegisterName(ctx, ctx.moduleInfoJSON.SubName),
Path: []string{ctx.ModuleDir()}, Path: []string{ctx.ModuleDir()},
Installed: installedStrings, Installed: installedStrings,
ModuleName: m.BaseModuleName() + m.moduleInfoJSON.SubName, ModuleName: m.BaseModuleName() + ctx.moduleInfoJSON.SubName,
SupportedVariants: []string{m.moduleInfoVariant(ctx)}, SupportedVariants: []string{m.moduleInfoVariant(ctx)},
TargetDependencies: targetRequired, TargetDependencies: targetRequired,
HostDependencies: hostRequired, HostDependencies: hostRequired,
Data: data, Data: data,
Required: m.RequiredModuleNames(ctx), Required: m.RequiredModuleNames(ctx),
} }
SetProvider(ctx, ModuleInfoJSONProvider, m.moduleInfoJSON) SetProvider(ctx, ModuleInfoJSONProvider, ctx.moduleInfoJSON)
} }
m.buildParams = ctx.buildParams m.buildParams = ctx.buildParams

8
android/module_context.go
View File

@@ -266,6 +266,10 @@ type moduleContext struct {
buildParams []BuildParams buildParams []BuildParams
ruleParams map[blueprint.Rule]blueprint.RuleParams ruleParams map[blueprint.Rule]blueprint.RuleParams
variables map[string]string variables map[string]string
// moduleInfoJSON can be filled out by GenerateAndroidBuildActions to write a JSON file that will
// be included in the final module-info.json produced by Make.
moduleInfoJSON *ModuleInfoJSON
} }
var _ ModuleContext = &moduleContext{} var _ ModuleContext = &moduleContext{}
@@ -729,11 +733,11 @@ func (m *moduleContext) LicenseMetadataFile() Path {
} }
func (m *moduleContext) ModuleInfoJSON() *ModuleInfoJSON { func (m *moduleContext) ModuleInfoJSON() *ModuleInfoJSON {
if moduleInfoJSON := m.module.base().moduleInfoJSON; moduleInfoJSON != nil { if moduleInfoJSON := m.moduleInfoJSON; moduleInfoJSON != nil {
return moduleInfoJSON return moduleInfoJSON
} }
moduleInfoJSON := &ModuleInfoJSON{} moduleInfoJSON := &ModuleInfoJSON{}
m.module.base().moduleInfoJSON = moduleInfoJSON m.moduleInfoJSON = moduleInfoJSON
return moduleInfoJSON return moduleInfoJSON
} }