StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ie1f9147e02f79062d1a17dca5f61ff518a2ae5a6
This commit is contained in:
Nikita Ioffe
2021-06-18 13:27:46 +00:00
committed by Automerger Merge Worker
parent 6ea9e45d9c f932613c3f
commit 59b8d28cf6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apex/apex.go
View File

@@ -171,8 +171,7 @@ type apexBundleProperties struct {
Ignore_system_library_special_case *bool Ignore_system_library_special_case *bool
// Whenever apex_payload.img of the APEX should include dm-verity hashtree. // Whenever apex_payload.img of the APEX should include dm-verity hashtree.
// Default value is false. // Default value is true.
// TODO(b/190621617): change default value to true.
Generate_hashtree *bool Generate_hashtree *bool
// Whenever apex_payload.img of the APEX should not be dm-verity signed. Should be only // 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 // See the generate_hashtree property
func (a *apexBundle) shouldGenerateHashtree() bool { 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 // See the test_only_unsigned_payload property