Merge "Set default value of generate_hashtree property to true" am: f932613c3f
am: 59b8d28cf6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1736785 Change-Id: Ic44e048dc70adb79f94db056ad8969f656e43d1e
This commit is contained in:
@@ -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
|
||||
@@ -1296,7 +1295,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
|
||||
|
Reference in New Issue
Block a user