Propagate aconfig providers for more modules.

Bug: 308625757
Test: manual
Change-Id: Iaf6d45a4259f1c6c34476c34c431344283ae2830
This commit is contained in:
LaMont Jones
2024-01-09 22:47:39 +00:00
parent acae2d7656
commit afe7baf47d
11 changed files with 76 additions and 0 deletions

View File

@@ -1994,6 +1994,10 @@ func (c *Module) stubLibraryMultipleApexViolation(ctx android.ModuleContext) boo
return false
}
func (d *Defaults) GenerateAndroidBuildActions(ctx android.ModuleContext) {
android.CollectDependencyAconfigFiles(ctx, &d.mergedAconfigFiles)
}
func (c *Module) GenerateAndroidBuildActions(actx android.ModuleContext) {
// Handle the case of a test module split by `test_per_src` mutator.
//
@@ -4075,6 +4079,9 @@ type Defaults struct {
android.ModuleBase
android.DefaultsModuleBase
android.ApexModuleBase
// Aconfig files for all transitive deps. Also exposed via TransitiveDeclarationsInfo
mergedAconfigFiles map[string]android.Paths
}
// cc_defaults provides a set of properties that can be inherited by other cc