diff options
| author | Colin Cross <ccross@android.com> | 2020-10-07 20:02:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 20:02:47 +0000 |
| commit | 04d9c96afe9c8aa7e5c4337672f6eb6100a2127a (patch) | |
| tree | 985eb98576f7c40de074168e5933e1e7c91eb496 /apex/apex_singleton.go | |
| parent | 466bea60299c25ac188ebc5927cfb641129027c4 (diff) | |
| parent | 393b394b854aa4555e036da2fb5e880ab9d0952c (diff) | |
Merge "Remove global state from apex modules" am: 43159bd1b7 am: 21bb1d491c am: 2c76247f51 am: 393b394b85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815
Change-Id: I264afeceec4bdbc344ba812b1c5fd88fed043214
Diffstat (limited to 'apex/apex_singleton.go')
| -rw-r--r-- | apex/apex_singleton.go | 7 |
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) + } } } }) |