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 "Allow uninstallable prebuilt_etc to be packaged" am: 525fdd57b5 am: c278ebe5b5 am: 9e2a93c8fb 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1591732

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaa3fe0db090f23cdffbd36114f9e85ac5002943
This commit is contained in:
Inseob Kim 2021-02-19 05:53:22 +00:00 committed by Automerger Merge Worker
parent bd72625520 9e2a93c8fb
commit f554fbd8aa
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/prebuilt_etc.go
View File

@ -282,11 +282,14 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx android.ModuleContext) {
Input: p.sourceFilePath,
})
if p.Installable() {
installPath := ctx.InstallFile(p.installDirPath, p.outputFilePath.Base(), p.outputFilePath)
for _, sl := range p.properties.Symlinks {
ctx.InstallSymlink(p.installDirPath, sl, installPath)
}
if !p.Installable() {
p.SkipInstall()
}
// Call InstallFile even when uninstallable to make the module included in the package
installPath := ctx.InstallFile(p.installDirPath, p.outputFilePath.Base(), p.outputFilePath)
for _, sl := range p.properties.Symlinks {
ctx.InstallSymlink(p.installDirPath, sl, installPath)
}
}