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

Merge "Make outputApexFile relative to module dir in mixed builds" am: f590058fd2 am: 7095c2a2fc

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

Change-Id: Ia79b125c88f64c2faad524b494f429b75aae8a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-04 02:26:21 +00:00
committed by Automerger Merge Worker
parent 7b572cef71 7095c2a2fc
commit 71298d6cdc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/apex.go
View File

@@ -1986,9 +1986,9 @@ func (a *apexBundle) ProcessBazelQueryResponse(ctx android.ModuleContext) {
// Set the output file to .apex or .capex depending on the compression configuration.
a.setCompression(ctx)
if a.isCompressed {
a.outputApexFile = android.PathForBazelOut(ctx, outputs.SignedCompressedOutput)
a.outputApexFile = android.PathForBazelOutRelative(ctx, ctx.ModuleDir(), outputs.SignedCompressedOutput)
} else {
a.outputApexFile = android.PathForBazelOut(ctx, outputs.SignedOutput)
a.outputApexFile = android.PathForBazelOutRelative(ctx, ctx.ModuleDir(), outputs.SignedOutput)
}
a.outputFile = a.outputApexFile