diff options
| author | 2023-11-28 13:14:56 -0800 | |
|---|---|---|
| committer | 2023-12-07 04:17:37 +0000 | |
| commit | d788b3e6cb8753ea3460bd2cb462aff27a966aef (patch) | |
| tree | 5697cd143425237537ced47c8cce1e017f8d6cea /apex/apex.go | |
| parent | 7dcbf427f981c8b0fd1f3639b044a3a2d7abbdec (diff) | |
Merge aconfig files per-module
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
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/apex.go b/apex/apex.go index 5d67c7aa5..7ddb3e6c5 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2394,7 +2394,7 @@ func (a *apexBundle) depVisitor(vctx *visitorContext, ctx android.ModuleContext, func addAconfigFiles(vctx *visitorContext, ctx android.ModuleContext, module blueprint.Module) { dep := ctx.OtherModuleProvider(module, aconfig.TransitiveDeclarationsInfoProvider).(aconfig.TransitiveDeclarationsInfo) if len(dep.AconfigFiles) > 0 && dep.AconfigFiles[ctx.ModuleName()] != nil { - vctx.aconfigFiles = append(vctx.aconfigFiles, dep.AconfigFiles[ctx.ModuleName()].ToList()...) + vctx.aconfigFiles = append(vctx.aconfigFiles, dep.AconfigFiles[ctx.ModuleName()]...) } } |