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

Remove duplicated CollectDependencyAconfigFiles()

Browse Source 
android.ModuleBase already calls aconfigUpdateAndroidBuildActions()
that is the same with CollectDependencyAconfigFiles(). Remove the
CollectDependencyAconfigFiles() to avoid duplication with
aconfigUpdateAndroidBuildActions().

To make the aconfig information available in
GenerateAndroidBuildActions() of all modules, call
aconfigUpdateAndroidBuildActions() before calling
GenerateAndroidBuildActions() of each module.

Also, we don't need SetAconfigFileMkEntries(), which is a duplicate
of aconfigUpdateAndroidMkData()

Bug: 335363964
Test: diff `adb shell printflags` before and after the change.
Change-Id: I52808e442e9fed7db1eae7b7c5ed0b1c5ba74f5d
This commit is contained in:
Justin Yun
2024-05-07 10:22:19 +09:00
parent dd056e087e
commit 40182b6ff3
18 changed files with 13 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
genrule/genrule.go
View File

@@ -180,9 +180,6 @@ type Module struct {
subName string
subDir string
// Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
mergedAconfigFiles map[string]android.Paths
}
type taskFunc func(ctx android.ModuleContext, rawCommand string, srcFiles android.Paths) []generateTask
@@ -588,24 +585,6 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
})
g.outputDeps = android.Paths{phonyFile}
}
android.CollectDependencyAconfigFiles(ctx, &g.mergedAconfigFiles)
}
func (g *Module) AndroidMkEntries() []android.AndroidMkEntries {
ret := android.AndroidMkEntries{
OutputFile: android.OptionalPathForPath(g.outputFiles[0]),
ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
android.SetAconfigFileMkEntries(g.AndroidModuleBase(), entries, g.mergedAconfigFiles)
},
},
}
return []android.AndroidMkEntries{ret}
}
func (g *Module) AndroidModuleBase() *android.ModuleBase {
return &g.ModuleBase
}
// Collect information for opening IDE project files in java/jdeps.go.