@iyexin/mio-android-tools 0.1.5 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/zipalign.js +14 -2
- package/dist/zipalign.js.map +1 -1
- package/package.json +1 -1
package/dist/zipalign.js
CHANGED
|
@@ -15,7 +15,14 @@ export async function alignApk(tools, input, output, options = {}) {
|
|
|
15
15
|
if (options.verbose)
|
|
16
16
|
args.push("-v");
|
|
17
17
|
args.push("4", input, output);
|
|
18
|
-
|
|
18
|
+
let result = await run(tools.zipalign, args, { timeoutMs: 120_000 });
|
|
19
|
+
if (result.code !== 0 && options.pageSize === 16) {
|
|
20
|
+
// Older zipalign builds (e.g. the distro package on linux-arm64) predate
|
|
21
|
+
// `-P`; fall back to 4 KiB page alignment rather than failing the build.
|
|
22
|
+
result = await run(tools.zipalign, ["-f", "-p", "4", input, output], {
|
|
23
|
+
timeoutMs: 120_000,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
19
26
|
if (result.code !== 0) {
|
|
20
27
|
throw new MioToolError("ZIPALIGN_FAILED", "zipalign failed", {
|
|
21
28
|
stdout: result.stdout,
|
|
@@ -26,7 +33,12 @@ export async function alignApk(tools, input, output, options = {}) {
|
|
|
26
33
|
}
|
|
27
34
|
export async function checkAlignment(tools, apk, options = {}) {
|
|
28
35
|
const args = ["-c", "-v", ...pageArgs(options.pageSize), "4", apk];
|
|
29
|
-
|
|
36
|
+
let result = await run(tools.zipalign, args, { timeoutMs: 120_000 });
|
|
37
|
+
if (result.code !== 0 && options.pageSize === 16) {
|
|
38
|
+
result = await run(tools.zipalign, ["-c", "-v", "-p", "4", apk], {
|
|
39
|
+
timeoutMs: 120_000,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
30
42
|
return {
|
|
31
43
|
ok: result.code === 0,
|
|
32
44
|
raw: `${result.stdout}${result.stderr}`,
|
package/dist/zipalign.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zipalign.js","sourceRoot":"","sources":["../src/zipalign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAgBhC,SAAS,QAAQ,CAAC,QAA8B;IAC9C,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,2CAA2C;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,KAAmB,EACnB,KAAa,EACb,MAAc,EACd,UAAwB,EAAE;IAE1B,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,IAAI,OAAO,CAAC,OAAO;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAE9B,
|
|
1
|
+
{"version":3,"file":"zipalign.js","sourceRoot":"","sources":["../src/zipalign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAgBhC,SAAS,QAAQ,CAAC,QAA8B;IAC9C,IAAI,QAAQ,KAAK,EAAE;QAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACzC,2CAA2C;IAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,QAAQ,CAC5B,KAAmB,EACnB,KAAa,EACb,MAAc,EACd,UAAwB,EAAE;IAE1B,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACnD,IAAI,OAAO,CAAC,OAAO;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAE9B,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;QACjD,yEAAyE;QACzE,yEAAyE;QACzE,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE;YACnE,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IACD,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,YAAY,CAAC,iBAAiB,EAAE,iBAAiB,EAAE;YAC3D,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,OAAO,EAAE,aAAa,MAAM,CAAC,IAAI,EAAE;SACpC,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,KAAmB,EACnB,GAAW,EACX,UAAwB,EAAE;IAE1B,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IACnE,IAAI,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC;IACrE,IAAI,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;QACjD,MAAM,GAAG,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE;YAC/D,SAAS,EAAE,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IACD,OAAO;QACL,EAAE,EAAE,MAAM,CAAC,IAAI,KAAK,CAAC;QACrB,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE;QACvC,QAAQ,EAAE,MAAM,CAAC,IAAI;KACtB,CAAC;AACJ,CAAC"}
|