openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Change-Id: I75cd5ce07f79f1ea4cee8791ed8cf3c9ddd22c0d
This commit is contained in:
Jooyung Han 2020-04-28 03:19:19 +00:00 committed by Automerger Merge Worker
parent f6645305fb d5c7ad63ec
commit 7e00c13d0e
1 changed files with 1 additions and 1 deletions
Show Stats 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())