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

Merge "Allow uninstallable prebuilt_etc to be packaged" am: 525fdd57b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6b3cf62a0c06d00a2390216f98c83f2edc5c5dd
This commit is contained in:
Inseob Kim
2021-02-19 04:19:13 +00:00
committed by Automerger Merge Worker
parent a55351cee1 525fdd57b5
commit c278ebe5b5
1 changed files with 8 additions and 5 deletions
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)
}
}