diff options
| author | 2018-11-22 02:51:54 +0900 | |
|---|---|---|
| committer | 2018-11-22 03:09:40 +0900 | |
| commit | bfe64a1a59c9ab3c8df63e733af4a64dc35870d8 (patch) | |
| tree | d7381a70a33fd81cae966aab976db461aa4971e1 | |
| parent | 552b362fdcf803934407f47bb500238768bbc44d (diff) | |
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
| -rw-r--r-- | apex/apex.go | 1 | ||||
| -rw-r--r-- | java/app_builder.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index d87988369..aad7c6531 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -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 }, }) } diff --git a/java/app_builder.go b/java/app_builder.go index b0983bde3..28fc4c490 100644 --- a/java/app_builder.go +++ b/java/app_builder.go @@ -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{ |