summaryrefslogtreecommitdiff
path: root/apex/apex_singleton.go
diff options
context:
space:
mode:
Diffstat (limited to 'apex/apex_singleton.go')
-rw-r--r--apex/apex_singleton.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/apex/apex_singleton.go b/apex/apex_singleton.go
index 314ec8b37..c1aca957e 100644
--- a/apex/apex_singleton.go
+++ b/apex/apex_singleton.go
@@ -72,8 +72,11 @@ func (s *apexDepsInfoSingleton) GenerateBuildActions(ctx android.SingletonContex
updatableFlatLists := android.Paths{}
ctx.VisitAllModules(func(module android.Module) {
if binaryInfo, ok := module.(android.ApexBundleDepsInfoIntf); ok {
- if path := binaryInfo.FlatListPath(); path != nil && binaryInfo.Updatable() {
- updatableFlatLists = append(updatableFlatLists, path)
+ apexInfo := ctx.ModuleProvider(module, android.ApexInfoProvider).(android.ApexInfo)
+ if path := binaryInfo.FlatListPath(); path != nil {
+ if binaryInfo.Updatable() || apexInfo.Updatable {
+ updatableFlatLists = append(updatableFlatLists, path)
+ }
}
}
})