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

Commit 569a495a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "apex: pass --align-file-size to signapk" am: c30a4c3f am: 9f354c86... 

Merge "apex: pass --align-file-size to signapk" am: c30a4c3f am: 9f354c86 am: 627ecdc0 am: abfc9cb9

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

Change-Id: I588269caa879fc5578d117f87f14d57d11927c18
parents 128ef694 abfc9cb9

apex/builder.go

+1 −1
Original line number Original line Diff line number Diff line
@@ -761,7 +761,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
	rule := java.Signapk

	rule := java.Signapk

	args := map[string]string{

	args := map[string]string{

		"certificates": pem.String() + " " + key.String(),

		"certificates": pem.String() + " " + key.String(),

		"flags":        "-a 4096", //alignment

		"flags":        "-a 4096 --align-file-size", //alignment

	}

	}

	implicits := android.Paths{pem, key}

	implicits := android.Paths{pem, key}

	if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") {

	if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_SIGNAPK") {