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

Commit bfe64a1a authored by Jiyong Park's avatar Jiyong Park
Browse files

Align entries in APEX at 4K boundary 

Use -a option of signapk to specify the alignment to 4K. The default is
4.

Test: m apex.test; zipalign -c -v 4096 $(OUT)/system/apex/apex.test.apex
shows ok

Change-Id: I7b1a3d442b69b89838cf09451939cd23d5646bde
parent 552b362f

apex/apex.go

+1 −0
Original line number Diff line number Diff line
@@ -662,6 +662,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext, keyFile and 
		Input:       unsignedOutputFile,

		Args: map[string]string{

			"certificates": strings.Join([]string{certificate.Pem.String(), certificate.Key.String()}, " "),

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

		},

	})

}

java/app_builder.go

+2 −2
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ var ( 
	Signapk = pctx.AndroidStaticRule("signapk",

		blueprint.RuleParams{

			Command: `${config.JavaCmd} -Djava.library.path=$$(dirname $signapkJniLibrary) ` +

				`-jar $signapkCmd $certificates $in $out`,

				`-jar $signapkCmd $flags $certificates $in $out`,

			CommandDeps: []string{"$signapkCmd", "$signapkJniLibrary"},

		},

		"certificates")

		"flags", "certificates")



	androidManifestMerger = pctx.AndroidStaticRule("androidManifestMerger",

		blueprint.RuleParams{