Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84de371a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Call InstallFile even when !installable" am: a07b5595 

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

Change-Id: I9c18959a7733877c1b3adddd8251bd0539205913
parents 59f957ab a07b5595

apex/builder.go

+2 −4
Original line number Original line Diff line number Diff line
@@ -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)