Rename test_only_no_hashtree to generate_hashtree
In order not to introduce any changes in the system image default value
of generate_hashtree is currently set to false. Once all the APEXes that
shouldn't have hashtree enable (i.e. non-updatable ones) explicitly set
`generate_hashtree: false` default value will be switched to true.
Test: checked that are no diffs between ${OUT}/system/apex without this
change and with this change.
Test: m
Bug: 190621617
Change-Id: I5a3144f8f6ea7dee25678af43e2b07a8c85daa9e
Merged-In: I5a3144f8f6ea7dee25678af43e2b07a8c85daa9e
(cherry picked from commit da6dc31389
)
This commit is contained in:
13
apex/apex.go
13
apex/apex.go
@@ -170,9 +170,10 @@ type apexBundleProperties struct {
|
||||
// Default is false.
|
||||
Ignore_system_library_special_case *bool
|
||||
|
||||
// Whenever apex_payload.img of the APEX should include dm-verity hashtree. Should be only
|
||||
// used in tests.
|
||||
Test_only_no_hashtree *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.
|
||||
Generate_hashtree *bool
|
||||
|
||||
// Whenever apex_payload.img of the APEX should not be dm-verity signed. Should be only
|
||||
// used in tests.
|
||||
@@ -1317,9 +1318,9 @@ func (a *apexBundle) installable() bool {
|
||||
return !a.properties.PreventInstall && (a.properties.Installable == nil || proptools.Bool(a.properties.Installable))
|
||||
}
|
||||
|
||||
// See the test_only_no_hashtree property
|
||||
func (a *apexBundle) testOnlyShouldSkipHashtreeGeneration() bool {
|
||||
return proptools.Bool(a.properties.Test_only_no_hashtree)
|
||||
// See the generate_hashtree property
|
||||
func (a *apexBundle) shouldGenerateHashtree() bool {
|
||||
return proptools.BoolDefault(a.properties.Generate_hashtree, false)
|
||||
}
|
||||
|
||||
// See the test_only_unsigned_payload property
|
||||
|
Reference in New Issue
Block a user