diff options
Diffstat (limited to 'etc/prebuilt_etc.go')
| -rw-r--r-- | etc/prebuilt_etc.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index 66df10145..764237821 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -155,6 +155,9 @@ type PrebuiltEtc struct { additionalDependencies *android.Paths makeClass string + + // Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo + mergedAconfigFiles map[string]android.Paths } type Defaults struct { @@ -365,6 +368,7 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) { symlinks: p.properties.Symlinks, } p.addInstallRules(ctx, ip) + android.CollectDependencyAconfigFiles(ctx, &p.mergedAconfigFiles) } type installProperties struct { @@ -433,11 +437,16 @@ func (p *PrebuiltEtc) AndroidMkEntries() []android.AndroidMkEntries { if p.additionalDependencies != nil { entries.AddStrings("LOCAL_ADDITIONAL_DEPENDENCIES", p.additionalDependencies.Strings()...) } + android.SetAconfigFileMkEntries(p.AndroidModuleBase(), entries, p.mergedAconfigFiles) }, }, }} } +func (p *PrebuiltEtc) AndroidModuleBase() *android.ModuleBase { + return &p.ModuleBase +} + func InitPrebuiltEtcModule(p *PrebuiltEtc, dirBase string) { p.installDirBase = dirBase p.AddProperties(&p.properties) |