diff options
| author | Colin Cross <ccross@android.com> | 2020-10-07 19:17:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 19:17:02 +0000 |
| commit | 2c76247f5162f3bdfa13ffc4cffbf41e94cfffbe (patch) | |
| tree | 666523dbe6a984f3173b031c54d2108585294d11 /apex/apex_singleton.go | |
| parent | ee7a67ae65033a38502e5d2380f08a8063a268c2 (diff) | |
| parent | 21bb1d491c85bc5661a83d74ece62ac550ba3114 (diff) | |
Merge "Remove global state from apex modules" am: 43159bd1b7 am: 21bb1d491c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815
Change-Id: I92cddf406596dee989f4794b75c3865f71206c79
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 afb739cef..803e0c559 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) + } } } }) |