From 17ff2838fc5fb2db76947effe5eb9730e24726de Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Mon, 27 Sep 2021 12:50:30 +0900 Subject: [PATCH] Call InstallFile even when !installable Not calling InstallFile when !installable prevents the module not only from being installed to the partition, but also from being packaged for a packaging_base. InstallFile already has a routine for not generating the install rule when the module is not installable. So, the check for can be safely omitted at the call site. Bug: 199674764 Test: m com.android.virt. the virt apex has com.android.runtime.64only.apex in system/apex Change-Id: I0249f5916496ed136dbf1978e04e2971852de244 --- apex/builder.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/apex/builder.go b/apex/builder.go index 6df40f4b8..c05c20c47 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -824,10 +824,8 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { a.outputFile = signedCompressedOutputFile } - // Install to $OUT/soong/{target,host}/.../apex - if a.installable() { - ctx.InstallFile(a.installDir, a.Name()+suffix, a.outputFile) - } + // Install to $OUT/soong/{target,host}/.../apex. + ctx.InstallFile(a.installDir, a.Name()+suffix, a.outputFile) // installed-files.txt is dist'ed a.installedFilesFile = a.buildInstalledFilesFile(ctx, a.outputFile, imageDir)