Version 3.31.0

Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>
CHANGELOG.md: Add entry for PR #613
2026-07-03 14:05:11 +02:00 · 2026-06-22 19:24:37 -04:00 · 2026-06-22 19:21:01 -04:00 · 2026-06-22 19:15:56 -04:00 · 2026-06-13 19:33:05 -04:00 · 2026-06-13 19:19:43 -04:00
10 changed files with 123 additions and 293 deletions
@@ -7,6 +7,18 @@
    to update the actual links at the bottom of the file.
 -->

+### Version 3.31.0
+
+* Update OTA metadata and payload manifest protobufs from AOSP `android-17.0.0_r1` release ([PR #613])
+
+### Version 3.30.2
+
+* Fix the symlink target path being incorrectly XZ-compressed when the Magisk patcher replaces a symlink with a regular file ([Issue #610], [PR #611])
+
+### Version 3.30.1
+
+* Fix `avbroot payload pack` and `avbroot zip pack --payload` for non-VABC devices ([Issue #607], [PR #608])
+
 ### Version 3.30.0

 * Add `avbroot ota list` subcommand to list all partitions in an OTA ([Issue #603], [PR #606])
@@ -501,6 +513,8 @@ Behind-the-scenes changes:
 [Issue #578]: https://github.com/chenxiaolong/avbroot/issues/578
 [Issue #593]: https://github.com/chenxiaolong/avbroot/issues/593
 [Issue #603]: https://github.com/chenxiaolong/avbroot/issues/603
+[Issue #607]: https://github.com/chenxiaolong/avbroot/issues/607
+[Issue #610]: https://github.com/chenxiaolong/avbroot/issues/610
 [PR #130]: https://github.com/chenxiaolong/avbroot/pull/130
 [PR #132]: https://github.com/chenxiaolong/avbroot/pull/132
 [PR #133]: https://github.com/chenxiaolong/avbroot/pull/133
@@ -734,3 +748,6 @@ Behind-the-scenes changes:
 [PR #594]: https://github.com/chenxiaolong/avbroot/pull/594
 [PR #605]: https://github.com/chenxiaolong/avbroot/pull/605
 [PR #606]: https://github.com/chenxiaolong/avbroot/pull/606
+[PR #608]: https://github.com/chenxiaolong/avbroot/pull/608
+[PR #611]: https://github.com/chenxiaolong/avbroot/pull/611
+[PR #613]: https://github.com/chenxiaolong/avbroot/pull/613
@@ -104,7 +104,7 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"

 [[package]]
 name = "avbroot"
-version = "3.30.0"
+version = "3.31.0"
 dependencies = [
 "anyhow",
 "assert_matches",
@@ -177,9 +177,9 @@ checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"

 [[package]]
 name = "bindgen"
-version = "0.71.1"
+version = "0.72.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
 dependencies = [
 "bitflags",
 "cexpr",
@@ -192,14 +192,14 @@ dependencies = [
 "regex",
 "rustc-hash",
 "shlex 1.3.0",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
 name = "bitflags"
-version = "2.12.1"
+version = "2.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a"
+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
 dependencies = [
 "serde_core",
 ]
@@ -215,9 +215,9 @@ dependencies = [

 [[package]]
 name = "block-buffer"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdd35008169921d80bc60d3d0ab416eecb028c4cd653352907921d95084790be"
+checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa"
 dependencies = [
 "hybrid-array",
 ]
@@ -253,9 +253,9 @@ dependencies = [

 [[package]]
 name = "bytes"
-version = "1.11.1"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593"

 [[package]]
 name = "bzip2"
@@ -277,9 +277,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.63"
+version = "1.2.65"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f"
+checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96"
 dependencies = [
 "find-msvc-tools",
 "shlex 2.0.1",
@@ -367,7 +367,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -550,7 +550,7 @@ checksum = "8034092389675178f570469e6c3b0465d3d30b4505c294a6550db47f3c17ad18"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -571,7 +571,7 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2"
 dependencies = [
- "block-buffer 0.12.0",
+ "block-buffer 0.12.1",
 "const-oid 0.10.2",
 "crypto-common 0.2.2",
 ]
@@ -596,7 +596,7 @@ checksum = "ecb08c4819242b1ec89b3d0c6affa229005bef46ae4f7eed8b80768187c10087"

 [[package]]
 name = "e2e"
-version = "3.30.0"
+version = "3.31.0"
 dependencies = [
 "anyhow",
 "avbroot",
@@ -692,7 +692,7 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"

 [[package]]
 name = "fuzz"
-version = "3.30.0"
+version = "3.31.0"
 dependencies = [
 "avbroot",
 "honggfuzz",
@@ -721,15 +721,13 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
 dependencies = [
 "cfg-if",
 "libc",
 "r-efi",
- "wasip2",
- "wasip3",
 ]

 [[package]]
@@ -822,12 +820,6 @@ dependencies = [
 "typenum",
 ]

-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -842,8 +834,6 @@ checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
 "equivalent",
 "hashbrown 0.17.1",
- "serde",
- "serde_core",
 ]

 [[package]]
@@ -880,12 +870,6 @@ dependencies = [
 "either",
 ]

-[[package]]
-name = "itoa"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
-
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -895,12 +879,6 @@ dependencies = [
 "spin",
 ]

-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
 [[package]]
 name = "libbz2-rs-sys"
 version = "0.2.5"
@@ -937,9 +915,9 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"

 [[package]]
 name = "log"
-version = "0.4.32"
+version = "0.4.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"

 [[package]]
 name = "logos"
@@ -972,7 +950,7 @@ dependencies = [
 "quote",
 "regex-syntax",
 "rustc_version",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -986,7 +964,7 @@ dependencies = [
 "quote",
 "regex-automata",
 "regex-syntax",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1027,15 +1005,15 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.8.1"
+version = "2.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
+checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"

 [[package]]
 name = "memmap2"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "714098028fe011992e1c3962653c96b2d578c4b4bce9036e15ff220319b1e0e3"
+checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0"
 dependencies = [
 "libc",
 ]
@@ -1059,7 +1037,7 @@ checksum = "db5b29714e950dbb20d5e6f74f9dcec4edbcc1067bb7f8ed198c097b8c1a818b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1231,9 +1209,9 @@ dependencies = [

 [[package]]
 name = "phf"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6"
 dependencies = [
 "phf_macros",
 "phf_shared",
@@ -1242,9 +1220,9 @@ dependencies = [

 [[package]]
 name = "phf_generator"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100"
 dependencies = [
 "fastrand",
 "phf_shared",
@@ -1252,22 +1230,22 @@ dependencies = [

 [[package]]
 name = "phf_macros"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085"
 dependencies = [
 "phf_generator",
 "phf_shared",
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
 name = "phf_shared"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89"
 dependencies = [
 "siphasher",
 ]
@@ -1332,7 +1310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
 dependencies = [
 "proc-macro2",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1346,9 +1324,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ea70524a2f82d518bce41317d0fae74151505651af45faf1ffbd6fd33f0568"
+checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -1356,9 +1334,9 @@ dependencies = [

 [[package]]
 name = "prost-build"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
+checksum = "03da047801ff44bb6a4d407d4860c05fd70bb81714e6b2f3812603d5b145b042"
 dependencies = [
 "heck",
 "itertools 0.14.0",
@@ -1369,21 +1347,21 @@ dependencies = [
 "prost",
 "prost-types",
 "regex",
- "syn 2.0.117",
+ "syn 2.0.118",
 "tempfile",
 ]

 [[package]]
 name = "prost-derive"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
+checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf"
 dependencies = [
 "anyhow",
 "itertools 0.14.0",
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1400,9 +1378,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.14.3"
+version = "0.14.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8991c4cbdb8bc5b11f0b074ffe286c30e523de90fee5ba8132f1399f23cb3dd7"
+checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a"
 dependencies = [
 "prost",
 ]
@@ -1436,9 +1414,9 @@ dependencies = [

 [[package]]
 name = "quote"
-version = "1.0.45"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
+checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368"
 dependencies = [
 "proc-macro2",
 ]
@@ -1507,9 +1485,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.12.3"
+version = "1.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -1530,9 +1508,9 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.8.10"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
+checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"

 [[package]]
 name = "ring"
@@ -1651,20 +1629,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.150"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
-dependencies = [
- "itoa",
- "memchr",
- "serde",
- "serde_core",
- "zmij",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1754,9 +1719,9 @@ checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"

 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"

 [[package]]
 name = "spin"
@@ -1805,9 +1770,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.117"
+version = "2.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
+checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1816,10 +1781,9 @@ dependencies = [

 [[package]]
 name = "system-properties"
-version = "0.2.1"
-source = "git+https://github.com/chenxiaolong/system-properties?tag=v0.2.1#1c7bf60d0912e74034804bb7f088fbad8f0a645e"
+version = "0.3.0"
+source = "git+https://github.com/chenxiaolong/system-properties?tag=v0.3.0#0c0848ad840500776d29ed255c378497d4bc1ace"
 dependencies = [
- "anyhow",
 "libc",
 "system-properties-bindgen",
 "thiserror",
@@ -1827,8 +1791,8 @@ dependencies = [

 [[package]]
 name = "system-properties-bindgen"
-version = "0.2.1"
-source = "git+https://github.com/chenxiaolong/system-properties?tag=v0.2.1#1c7bf60d0912e74034804bb7f088fbad8f0a645e"
+version = "0.3.0"
+source = "git+https://github.com/chenxiaolong/system-properties?tag=v0.3.0#0c0848ad840500776d29ed255c378497d4bc1ace"
 dependencies = [
 "bindgen",
 "libc",
@@ -1841,7 +1805,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
 dependencies = [
 "fastrand",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
 "once_cell",
 "rustix",
 "windows-sys 0.61.2",
@@ -1864,7 +1828,7 @@ checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1894,7 +1858,7 @@ checksum = "2d2e76690929402faae40aebdda620a2c0e25dd6d3b9afe48867dfd95991f4bd"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -1974,7 +1938,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
@@ -2036,12 +2000,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -2072,58 +2030,6 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"

-[[package]]
-name = "wasip2"
-version = "1.0.3+wasi-0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
-dependencies = [
- "wit-bindgen 0.57.1",
-]
-
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen 0.51.0",
-]
-
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap",
- "wasm-encoder",
- "wasmparser",
-]
-
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags",
- "hashbrown 0.15.5",
- "indexmap",
- "semver",
-]
-
 [[package]]
 name = "windows-link"
 version = "0.2.1"
@@ -2221,100 +2127,6 @@ dependencies = [
 "memchr",
 ]

-[[package]]
-name = "wit-bindgen"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
-[[package]]
-name = "wit-bindgen"
-version = "0.57.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck",
- "indexmap",
- "prettyplease",
- "syn 2.0.117",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags",
- "indexmap",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
-
 [[package]]
 name = "x509-cert"
 version = "0.2.5"
@@ -2331,7 +2143,7 @@ dependencies = [

 [[package]]
 name = "xtask"
-version = "3.30.0"
+version = "3.31.0"
 dependencies = [
 "anyhow",
 "clap",
@@ -2341,52 +2153,46 @@ dependencies = [

 [[package]]
 name = "zerocopy"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1"
+checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
 dependencies = [
 "zerocopy-derive",
 ]

 [[package]]
 name = "zerocopy-derive"
-version = "0.8.50"
+version = "0.8.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639"
+checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
 dependencies = [
 "zeroize_derive",
 ]

 [[package]]
 name = "zeroize_derive"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"
+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.117",
+ "syn 2.0.118",
 ]

 [[package]]
 name = "zlib-rs"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"
-
-[[package]]
-name = "zmij"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+checksum = "977347db8caa080403f6b6b7c1cda9479a8e869316f7e13a59b19076a40f94e3"
@@ -4,7 +4,7 @@ members = ["avbroot", "e2e", "fuzz", "xtask"]
 resolver = "2"

 [workspace.package]
-version = "3.30.0"
+version = "3.31.0"
 license = "GPL-3.0-only"
 edition = "2024"
 repository = "https://github.com/chenxiaolong/avbroot"
@@ -34,7 +34,7 @@ memchr = "2.6.0"
 num-bigint-dig = "0.8.4"
 num-traits = "0.2.16"
 passterm = "2.0.3"
-phf = { version = "0.13.1", features = ["macros"] }
+phf = { version = "0.14.0", features = ["macros"] }
 pkcs8 = { version = "0.10.2", features = ["encryption", "pem"] }
 prost = "0.14.1"
 # We can't upgrade to 0.9.0 until rsa updates its rand_core dependency.
@@ -66,7 +66,7 @@ libc = "0.2.158"
 rustix = { version = "1.0.3", default-features = false, features = ["process"] }

 [target.'cfg(target_os = "android")'.dependencies]
-system-properties = { git = "https://github.com/chenxiaolong/system-properties", tag = "v0.2.1" }
+system-properties = { git = "https://github.com/chenxiaolong/system-properties", tag = "v0.3.0" }

 [build-dependencies]
 constcat = "0.6.0"
@@ -104,9 +104,10 @@ message OtaMetadata {
  // The expected device state after the update.
  DeviceState postcondition = 6;

-  // True if the ota that updates a device to support dynamic partitions, where
-  // the source build doesn't support it.
-  bool retrofit_dynamic_partitions = 7;
+  // This was previously a boolean flag called retrofit_dynamic_partitions, but
+  // is no longer used or supported.
+  reserved 7;
+
  // The required size of the cache partition, only valid for non-A/B update.
  int64 required_cache = 8;

@@ -82,6 +82,8 @@
 // - REPLACE_XZ: Replace the dst_extents with the contents of the attached
 //   xz file after decompression. The xz file should only use crc32 or no crc at
 //   all to be compatible with xz-embedded.
+// - REPLACE_ZSTD: Replace the dst_extents with the contents of the attached
+//   zstd file after decompression.
 // - PUFFDIFF: Read the data in src_extents in the old partition, perform
 //   puffpatch with the attached data and write the new data to dst_extents in
 //   the new partition.
@@ -174,6 +176,9 @@ message InstallOperation {
    // On minor version 9 or newer, these operations are supported:
    LZ4DIFF_BSDIFF = 12;
    LZ4DIFF_PUFFDIFF = 13;
+
+    // On minor version 10 or newer, these operations are supported:
+    REPLACE_ZSTD = 14;
  }
  required Type type = 1;

@@ -376,6 +381,10 @@ message DynamicPartitionMetadata {
  // Max bytes to be compressed at once during ota. Options: 4k, 8k, 16k, 32k,
  // 64k, 128k
  optional uint64 compression_factor = 7;
+
+  // Whether to disable UBLK for OTA. This will force dm-user as OTA backend
+  // choice even if device was configured for UBLK based snapshots.
+  optional bool disable_ublk = 8;
 }

 // Definition has been duplicated from
@@ -219,8 +219,11 @@ pub fn pack_payload(

    for (name, input_file) in &input_files {
        let Some(dpm) = &header.manifest.dynamic_partition_metadata else {
-            continue;
+            break;
        };
+        if !dpm.vabc_enabled() {
+            break;
+        }

        if !dpm.groups.iter().any(|g| g.partition_names.contains(name)) {
            continue;
@@ -172,9 +172,6 @@ pub fn parse_legacy_metadata(data: &str) -> Result<OtaMetadata> {
                }
            }
            "ota-wipe" => metadata.wipe = parse_yes()?,
-            "ota-retrofit-dynamic-partitions" => {
-                metadata.retrofit_dynamic_partitions = parse_yes()?;
-            }
            "ota-downgrade" => metadata.downgrade = parse_yes()?,
            "ota-required-cache" => {
                metadata.required_cache = value.parse().map_err(|_| unsupported())?;
@@ -240,12 +237,6 @@ fn serialize_metadata(metadata: &OtaMetadata) -> (String, Vec<u8>) {
    if metadata.wipe {
        pairs.insert("ota-wipe".to_owned(), "yes".to_owned());
    }
-    if metadata.retrofit_dynamic_partitions {
-        pairs.insert(
-            "ota-retrofit-dynamic-partitions".to_owned(),
-            "yes".to_owned(),
-        );
-    }
    if metadata.downgrade {
        pairs.insert("ota-downgrade".to_owned(), "yes".to_owned());
    }
@@ -32,7 +32,7 @@ use crate::{
        avb::{self, AppendedDescriptorMut, Footer, Header},
        bootimage::{self, BootImage, BootImageExt, RamdiskMeta},
        compression::{self, CompressedFormat, CompressedReader, CompressedWriter},
-        cpio::{self, CpioEntry, CpioEntryData},
+        cpio::{self, CpioEntry, CpioEntryData, CpioEntryType},
        zip::{self, ZipEntriesSafeExt, ZipFileHeaderRecordExt, ZipSliceEntriesSafeExt},
    },
    patch::otacert::{self, OtaCertBuildFlags},
@@ -407,7 +407,10 @@ impl MagiskRootPatcher {
            let mut new_path = b".backup/".to_vec();
            new_path.extend(&old_entry.path);

-            let new_data = if xz_compress && let CpioEntryData::Data(data) = &old_entry.data {
+            let new_data = if xz_compress
+                && old_entry.file_type == CpioEntryType::Regular
+                && let CpioEntryData::Data(data) = &old_entry.data
+            {
                new_path.extend(b".xz");

                let reader = Cursor::new(data);
@@ -664,6 +664,7 @@ fn create_payload(
                    CowVersion::V2 => v.force_compression_factor.then_some(64 * 1024),
                    CowVersion::V3 { compression_factor } => Some(compression_factor.into()),
                }),
+                disable_ublk: None,
            }),
            partial_update: None,
            apex_info: vec![],
@@ -820,7 +821,6 @@ fn create_ota(
            security_patch_level: ota_info.security_patch_level.clone(),
            partition_state: vec![],
        }),
-        retrofit_dynamic_partitions: false,
        required_cache: 0,
        spl_downgrade: false,
    };
Author	SHA1	Message	Date
Andrew Gunnerson	6344a927eb	Version 3.31.0 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-22 19:24:37 -04:00
Andrew Gunnerson	29704910e4	CHANGELOG.md: Add entry for PR #613 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-22 19:21:01 -04:00
Andrew Gunnerson	ac84e056a1	Update protobufs for Android 17 and update dependencies retrofit_dynamic_partitions is gone from the payload manifest, but this wasn't used by devices supporting avbroot anyway. This fixes the disable_ublk OTA metadata field being lost when patching an Android 17 OTA that uses it. Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-22 19:15:56 -04:00
Andrew Gunnerson	f95ef1f8c1	Version 3.30.2 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-13 19:33:05 -04:00
Andrew Gunnerson	e5a373b59b	CHANGELOG.md: Add entry for PR #611 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-13 19:19:43 -04:00
rushiiMachine	ddb8611e27	fix: only compress regular files during Magisk backup Creation of Magisk .backup/ files should only xz-compress real files, and ignore other types such as symlinks. This fixes the case where /init is a symlink, and avbroot incorrectly puts the backup symlink at .backup/init.xz with the target path being compressed binary data. Fixes: #610	2026-06-10 22:10:18 -07:00
Andrew Gunnerson	02b172b1c9	Version 3.30.1 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-06 16:44:50 -04:00
Andrew Gunnerson	8cbcb44e23	CHANGELOG.md: Add entry for PR #608 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-06 16:42:45 -04:00
Andrew Gunnerson	144e635257	cli/payload: Skip recow for non-VABC payloads when packing Setting the CoW size for non-VABC payloads is invalid and results in the recow process failing with: ERROR Partition has CoW estimate, but VABC is disabled: <name> Fixes: #607 Signed-off-by: Andrew Gunnerson <accounts+github@chiller3.com>	2026-06-06 16:33:19 -04:00