Merge "Adding hash partitions digest and hash algorithm in ro properties." into main
diff --git a/Android.bp b/Android.bp
index af5b6b6..ab8a21b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -227,6 +227,12 @@
"libcrypto_baremetal",
],
srcs: ["libavb/avb_sysdeps_posix.c"],
+
+ // b/336916369: This library gets linked into a rust rlib. Disable LTO
+ // until cross-language lto is supported.
+ lto: {
+ never: true,
+ },
}
// Baremetal libavb
diff --git a/avbtool.py b/avbtool.py
index 76a057b..595936c 100755
--- a/avbtool.py
+++ b/avbtool.py
@@ -47,6 +47,7 @@
AVB_FOOTER_VERSION_MINOR = 0
AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED = 1
+AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED = 2
# Configuration for enabling logging of calls to avbtool.
AVB_INVOCATION_LOGFILE = os.environ.get('AVB_INVOCATION_LOGFILE')
@@ -4312,6 +4313,9 @@
sub_parser.add_argument('--set_hashtree_disabled_flag',
help='Set the HASHTREE_DISABLED flag',
action='store_true')
+ sub_parser.add_argument('--set_verification_disabled_flag',
+ help='Set the VERIFICATION_DISABLED flag',
+ action='store_true')
def _add_common_footer_args(self, sub_parser):
"""Adds arguments used by add_*_footer sub-commands.
@@ -4343,6 +4347,8 @@
"""
if args.set_hashtree_disabled_flag:
args.flags |= AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED
+ if args.set_verification_disabled_flag:
+ args.flags |= AVB_VBMETA_IMAGE_FLAGS_VERIFICATION_DISABLED
return args
def run(self, argv):
