StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "apex: file_contexts for override_apex flattened" into rvc-dev am: d5c7ad63ec am: 5cf94ce9dc am: d5175f7952

Browse Source 
Change-Id: I9648e938ce60ea8d15c30d723954cc90e6e5d639
This commit is contained in:
Jooyung Han
2020-04-28 03:57:43 +00:00
committed by Automerger Merge Worker
parent 54f52dd33e d5175f7952
commit 4458ce273b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/builder.go
View File

@@ -596,7 +596,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())