diff options
| author | 2020-10-07 19:05:15 +0000 | |
|---|---|---|
| committer | 2020-10-07 19:05:15 +0000 | |
| commit | 21bb1d491c85bc5661a83d74ece62ac550ba3114 (patch) | |
| tree | 35345376d9aa3db8fde6b578017b99894a2c01ea /apex/apex_singleton.go | |
| parent | d8c90a7e8d21244fc01e74862a2ce19cd378c6c8 (diff) | |
| parent | 43159bd1b7c99790d84fdedda09db3701d466f30 (diff) | |
Merge "Remove global state from apex modules" am: 43159bd1b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1428815
Change-Id: I9ddb389c6a107e7431ba761c58b0ab99048fbc11
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) + } } } }) |