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

Merge aconfig files per-module

Browse Source 
Passing the list of all transitive aconfig files to Make causes extra
Kati analysis runs when dependencies are changed in Android.bp files.
Since Make is going to merge them anyways, merge them per-module and
pass a single aconfig file to Make for each module.

Fixes: 313698230
Test: m out/target/product/vsoc_x86_64/system/etc/aconfig_flags.pb
Change-Id: Ifde4826bc93bc06e40338f72b4cb39eed26ca08d
This commit is contained in:
Colin Cross
2023-11-28 13:14:56 -08:00
parent 7dcbf427f9
commit d788b3e6cb
11 changed files with 56 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/androidmk.go
View File

@@ -134,7 +134,7 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
"$(SOONG_SDK_VARIANT_MODULES) $(patsubst %.sdk,%,$(LOCAL_MODULE))")
}
// TODO(b/311155208): The container here should be system.
entries.SetOptionalPaths("LOCAL_ACONFIG_FILES", c.getTransitiveAconfigFiles(""))
entries.SetPaths("LOCAL_ACONFIG_FILES", c.mergedAconfigFiles[""])
},
},
ExtraFooters: []android.AndroidMkExtraFootersFunc{

8
cc/cc.go
View File

@@ -928,7 +928,7 @@ type Module struct {
hideApexVariantFromMake bool
// Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
transitiveAconfigFiles map[string]*android.DepSet[android.Path]
mergedAconfigFiles map[string]android.Paths
}
func (c *Module) AddJSONData(d *map[string]interface{}) {
@@ -2324,7 +2324,7 @@ func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
}
ctx.SetProvider(blueprint.SrcsFileProviderKey, blueprint.SrcsFileProviderData{SrcPaths: deps.GeneratedSources.Strings()})
aconfig.CollectTransitiveAconfigFiles(ctx, &c.transitiveAconfigFiles)
aconfig.CollectDependencyAconfigFiles(ctx, &c.mergedAconfigFiles)
c.maybeInstall(ctx, apexInfo)
}
@@ -2345,10 +2345,6 @@ func (c *Module) maybeUnhideFromMake() {
}
}
func (c *Module) getTransitiveAconfigFiles(container string) []android.Path {
return c.transitiveAconfigFiles[container].ToList()
}
// maybeInstall is called at the end of both GenerateAndroidBuildActions and
// ProcessBazelQueryResponse to run the install hooks for installable modules,
// like binaries and tests.