commit 4c0f6849b8f35039c6947ed375d594bd1a774b73
author Nolen Johnson <johnsonnolen@gmail.com> Sun May 09 16:04:34 2021 -0400
committer Alexander Martinz <amartinz@shiftphones.com> Wed Feb 09 18:24:36 2022 +0100
tree fc408a1eff80da8f1dc8f5a5548a8abccf9f03ed
parent 88e692b0f59c41de66faec6701ba8d2a29e096e7

axolotl: Simplify AVB flag logic

* AVB's `--flags 3` argument builds a disabled VBMeta with
  disabled hashtree, so no need to set both flags individually.

Change-Id: Idcd3e38c1524bafaf923438b62d1f34ca100af37

BoardConfig.mk

diff --git a/BoardConfig.mk b/BoardConfig.mk
index a6ef85d..5f33853 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -130,8 +130,7 @@
 BOARD_AVB_ENABLE := true
 
 # Build the image with verity pre-disabled - https://android.googlesource.com/platform/external/avb/+/58305521295e51cb52a74d8d8bbaed738cf0767a
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3
 
 #####