commit f590058fd2e87331dd701703763beba158d0929c
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 04 01:35:10 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 04 01:35:10 2023 +0000
tree e1d3fe7a14d958efa820e5f2f0b4878d4bb41ba9
parent 0766f4c66c3f65aa4600caf7dcbcfc9310740cf6
parent b0bfa07919f7c0961c74b3953a004b3f9c30b247

Merge "Make outputApexFile relative to module dir in mixed builds"

apex/apex.go

diff --git a/apex/apex.go b/apex/apex.go
index 3678636..5451a04 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1986,9 +1986,9 @@
 	// 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