diff options
| author | 2020-09-09 20:21:02 -0700 | |
|---|---|---|
| committer | 2020-09-09 20:21:02 -0700 | |
| commit | 429c23c1fa71b4f542fadece635801c6edb1aa50 (patch) | |
| tree | 09d185449732c712f40c2e204a093d044dc8570f /apex/builder.go | |
| parent | 4f35976c87c24f4584ff8f86298c63c75f063be4 (diff) | |
| parent | fbd7372401e29a5f9b5e3f0a9f959455f4e77168 (diff) | |
Merge Android R
Bug: 168057903
Merged-In: I9d5d0da0f409bd6b131f7e0f6363be061d3045c1
Change-Id: Ie7feaf6a3d0787c750de17540969b876a4306b0a
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builder.go b/apex/builder.go index 26afb04d2..852a6c029 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -690,7 +690,7 @@ func (a *apexBundle) buildFlattenedApex(ctx android.ModuleContext) { apexBundleName := a.Name() a.outputFile = android.PathForModuleInstall(&factx, "apex", apexBundleName) - if a.installable() && a.GetOverriddenBy() == "" { + if a.installable() { installPath := android.PathForModuleInstall(ctx, "apex", apexBundleName) devicePath := android.InstallPathToOnDevicePath(ctx, installPath) addFlattenedFileContextsInfos(ctx, apexBundleName+":"+devicePath+":"+a.fileContexts.String()) |