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

Merge "Call InstallFile even when !installable" am: a07b559571 am: 84de371ad9 am: 55b672b7e6

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

Change-Id: I07ce1762cda25c85417aeb5c2222e7d19b9148ae
This commit is contained in:
Treehugger Robot
2021-09-30 10:41:55 +00:00
committed by Automerger Merge Worker
parent 299063b1b4 55b672b7e6
commit 347c881327
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/builder.go
View File

@@ -824,10 +824,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) {
a.outputFile = signedCompressedOutputFile a.outputFile = signedCompressedOutputFile
} }
// Install to $OUT/soong/{target,host}/.../apex // Install to $OUT/soong/{target,host}/.../apex.
if a.installable() { ctx.InstallFile(a.installDir, a.Name()+suffix, a.outputFile)
ctx.InstallFile(a.installDir, a.Name()+suffix, a.outputFile)
}
// installed-files.txt is dist'ed // installed-files.txt is dist'ed
a.installedFilesFile = a.buildInstalledFilesFile(ctx, a.outputFile, imageDir) a.installedFilesFile = a.buildInstalledFilesFile(ctx, a.outputFile, imageDir)