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

Commit f590058f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 0766f4c6 b0bfa079

apex/apex.go

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