diff options
| author | 2025-02-04 09:49:50 -0800 | |
|---|---|---|
| committer | 2025-02-04 09:49:50 -0800 | |
| commit | 93a9c7341c217406c2f6db53e14ee7fb39d8e6fa (patch) | |
| tree | f808cab9ca294296663813911232f32a971223dd /filesystem | |
| parent | 0e60ed234eb2e7fe827d300ddeb12c3d7f1c74e8 (diff) | |
| parent | 50fb49cabe70cfbde6743acb18543cd14befb7a5 (diff) | |
Merge "Default avb_hash_algorithm to sha256 for android_filesystem modules" into main
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/filesystem.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 660603741..0ce31b293 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -119,7 +119,7 @@ type FilesystemProperties struct { Avb_algorithm *string // Hash algorithm used for avbtool (for descriptors). This is passed as hash_algorithm to - // avbtool. Default used by avbtool is sha1. + // avbtool. Default is sha256. Avb_hash_algorithm *string // The security patch passed to as the com.android.build.<type>.security_patch avb property. @@ -903,9 +903,8 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and if !proptools.BoolDefault(f.properties.Use_fec, true) { avb_add_hashtree_footer_args += " --do_not_generate_fec" } - if hashAlgorithm := proptools.String(f.properties.Avb_hash_algorithm); hashAlgorithm != "" { - avb_add_hashtree_footer_args += " --hash_algorithm " + hashAlgorithm - } + hashAlgorithm := proptools.StringDefault(f.properties.Avb_hash_algorithm, "sha256") + avb_add_hashtree_footer_args += " --hash_algorithm " + hashAlgorithm if f.properties.Rollback_index != nil { rollbackIndex := proptools.Int(f.properties.Rollback_index) if rollbackIndex < 0 { |