diff options
Diffstat (limited to 'cc/cc.go')
| -rw-r--r-- | cc/cc.go | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -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. |