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 am: c278ebe5b5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51ae00b895a2777e24dde49948445bfa6dbba19b
This commit is contained in:
Inseob Kim
2021-02-19 04:58:12 +00:00
committed by Automerger Merge Worker
parent 29083678d0 c278ebe5b5
commit 9e2a93c8fb
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, Input: p.sourceFilePath,
}) })
if p.Installable() { if !p.Installable() {
installPath := ctx.InstallFile(p.installDirPath, p.outputFilePath.Base(), p.outputFilePath) p.SkipInstall()
for _, sl := range p.properties.Symlinks { }
ctx.InstallSymlink(p.installDirPath, sl, installPath)
} // 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)
} }
} }