commit 9c8120aa48aab85c60efc0e9fb2e1845f6f83397
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 11 21:43:34 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 11 21:43:34 2018 +0000
tree a24395280f7e8558a5144cfd2dd7f1aea75e6ed2
parent 92222c3a62fcee67213f0a87493986edcdfc8dbd
parent 0588b4337a59d87a048d71dacc1e3fa05c36e0a2

Merge "Disable verity on -eng builds"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index fc724ea..a7fd73c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2278,6 +2278,10 @@
 BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --rollback_index $(BOARD_AVB_ROLLBACK_INDEX)
 endif
 
+ifeq (eng,$(filter eng, $(TARGET_BUILD_VARIANT)))
+BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
+endif
+
 ifndef BOARD_BOOTIMAGE_PARTITION_SIZE
   $(error BOARD_BOOTIMAGE_PARTITION_SIZE must be set for BOARD_AVB_ENABLE)
 endif