commit b64a0f3b037d2e8930c6898da4093dbb518f0a3a
author Treehugger Robot <treehugger-gerrit@google.com> Mon Oct 22 22:44:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 22 22:44:54 2018 +0000
tree 919f3bb02bd138b7a11e43fb88bf6d208f45802b
parent 4c95ffa8ef537320268b6d2a0a48afec88a6ada1
parent 240dcb8c458d29a0b00f7f6be55b2f4a0a4d86a5

Merge "Only set set_hashtree_disabled_flag in top-level vbmeta.img."

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index fe728d6..da1fbc2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2779,9 +2779,8 @@
 BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS += --padding_size 4096
 
 ifeq (eng,$(filter eng, $(TARGET_BUILD_VARIANT)))
+# We only need the flag in top-level vbmeta.img.
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_SYSTEM_IMAGE_ARGS += --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_VENDOR_IMAGE_ARGS += --set_hashtree_disabled_flag
 endif
 
 ifdef BOARD_AVB_ROLLBACK_INDEX