diff options
Diffstat (limited to 'apex/deapexer.go')
| -rw-r--r-- | apex/deapexer.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apex/deapexer.go b/apex/deapexer.go index 5aeea63d1..5ff622c5b 100644 --- a/apex/deapexer.go +++ b/apex/deapexer.go @@ -98,6 +98,7 @@ func privateDeapexerFactory() android.Module { func (p *Deapexer) DepsMutator(ctx android.BottomUpMutatorContext) { // Add dependencies from the java modules to which this exports files from the `.apex` file onto // this module so that they can access the `DeapexerInfo` object that this provides. + // TODO: b/308174306 - Once all the mainline modules have been flagged, drop this dependency edge for _, lib := range p.properties.CommonModules { dep := prebuiltApexExportedModuleName(ctx, lib) ctx.AddReverseDependency(ctx.Module(), android.DeapexerTag, dep) @@ -126,7 +127,7 @@ func (p *Deapexer) GenerateAndroidBuildActions(ctx android.ModuleContext) { // apex relative path to extracted file path available for other modules. if len(exports) > 0 { // Make the information available for other modules. - di := android.NewDeapexerInfo(apexModuleName(ctx.ModuleName()), exports) + di := android.NewDeapexerInfo(apexModuleName(ctx.ModuleName()), exports, p.properties.CommonModules) android.SetProvider(ctx, android.DeapexerProvider, di) // Create a sorted list of the files that this exports. |