Merge "Disable verity on -eng builds"

2018-06-11 21:43:34 +00:00 · 2018-06-11 21:43:34 +00:00 · 9c8120aa48
parent 92222c3a62 0588b4337a
commit 9c8120aa48
1 changed files with 4 additions and 0 deletions
--- a/core/Makefile
+++ b/core/Makefile
@ -2278,6 +2278,10 @@ ifdef BOARD_AVB_ROLLBACK_INDEX
 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