diff options
| author | 2024-05-07 10:22:19 +0900 | |
|---|---|---|
| committer | 2024-05-10 10:00:14 +0900 | |
| commit | 40182b6ff33ed7d91837212000524e74bf2392c7 (patch) | |
| tree | e0bfc773c5d5864a548dbe1d4f291b7b59575d4f /apex/prebuilt.go | |
| parent | dd056e087eddbee56d205694ecc9f51c435d49dc (diff) | |
Remove duplicated CollectDependencyAconfigFiles()
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
Diffstat (limited to 'apex/prebuilt.go')
| -rw-r--r-- | apex/prebuilt.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/apex/prebuilt.go b/apex/prebuilt.go index ea847e15c..72a9e5219 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -503,9 +503,6 @@ type Prebuilt struct { inputApex android.Path provenanceMetaDataFile android.OutputPath - - // Single aconfig "cache file" merged from this module and all dependencies. - mergedAconfigFiles map[string]android.Paths } type ApexFileProperties struct { @@ -881,8 +878,6 @@ func (p *Prebuilt) GenerateAndroidBuildActions(ctx android.ModuleContext) { p.installedFile = ctx.InstallFile(p.installDir, p.installFilename, p.inputApex, p.compatSymlinks...) p.provenanceMetaDataFile = provenance.GenerateArtifactProvenanceMetaData(ctx, p.inputApex, p.installedFile) } - - android.CollectDependencyAconfigFiles(ctx, &p.mergedAconfigFiles) } func (p *Prebuilt) ProvenanceMetaDataFile() android.OutputPath { |