From e261ae64e2d72f6b7fab29f513ba00ca50e2ba24 Mon Sep 17 00:00:00 2001
From: Nikita Ioffe <ioffe@google.com>
Date: Wed, 16 Jun 2021 18:15:03 +0100
Subject: [PATCH] Set default value of generate_hashtree property to true

Test: presubmit
Test: m
Bug: 190621617
Change-Id: I546730f168632c5d5d41c686853bde93a8ba7911
---
 apex/apex.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apex/apex.go b/apex/apex.go
index 33b83c0bc..7e38b61cd 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -171,8 +171,7 @@ type apexBundleProperties struct {
 	Ignore_system_library_special_case *bool
 
 	// Whenever apex_payload.img of the APEX should include dm-verity hashtree.
-	// Default value is false.
-	// TODO(b/190621617): change default value to true.
+	// Default value is true.
 	Generate_hashtree *bool
 
 	// Whenever apex_payload.img of the APEX should not be dm-verity signed. Should be only
@@ -1320,7 +1319,7 @@ func (a *apexBundle) installable() bool {
 
 // See the generate_hashtree property
 func (a *apexBundle) shouldGenerateHashtree() bool {
-	return proptools.BoolDefault(a.properties.Generate_hashtree, false)
+	return proptools.BoolDefault(a.properties.Generate_hashtree, true)
 }
 
 // See the test_only_unsigned_payload property