From 0588b4337a59d87a048d71dacc1e3fa05c36e0a2 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Thu, 3 May 2018 13:20:01 -0700
Subject: [PATCH] Disable verity on -eng builds

Verity is counter to the goal of -eng builds, so disable it on -eng
builds.

Change-Id: I9f9851d14948be04834394dc5e5445a36aafa945
Merged-In: I9f9851d14948be04834394dc5e5445a36aafa945
Fixes: 64315394
Test: verified -eng doesn't have verity enabled, but -userdebug does
---
 core/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/Makefile b/core/Makefile
index fc724ea1a0..a7fd73c16e 100644
--- 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