Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b8d28c authored by Nikita Ioffe's avatar Nikita Ioffe Committed by Automerger Merge Worker
Browse files

Merge "Set default value of generate_hashtree property to true" am: f932613c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736785

Change-Id: Ie1f9147e02f79062d1a17dca5f61ff518a2ae5a6
parents 6ea9e45d f932613c

apex/apex.go

+2 −3
Original line number Diff line number Diff line
@@ -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
@@ -1343,7 +1342,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