Merge "Set default value of generate_hashtree property to true" into sc-dev (5476c95e) · Commits · e / os / android_build_soong

apex/apex.go

+2 −3

Original line number	Diff line number	Diff line
		@@ -166,8 +166,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
		@@ -1294,7 +1293,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