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"

Browse Source
This commit is contained in:
Treehugger Robot
2023-04-04 01:35:10 +00:00
committed by Gerrit Code Review
parent 0766f4c66c b0bfa07919
commit f590058fd2
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. // Set the output file to .apex or .capex depending on the compression configuration.
a.setCompression(ctx) a.setCompression(ctx)
if a.isCompressed { if a.isCompressed {
a.outputApexFile = android.PathForBazelOut(ctx, outputs.SignedCompressedOutput) a.outputApexFile = android.PathForBazelOutRelative(ctx, ctx.ModuleDir(), outputs.SignedCompressedOutput)
} else { } else {
a.outputApexFile = android.PathForBazelOut(ctx, outputs.SignedOutput) a.outputApexFile = android.PathForBazelOutRelative(ctx, ctx.ModuleDir(), outputs.SignedOutput)
} }
a.outputFile = a.outputApexFile a.outputFile = a.outputApexFile