diff options
| author | 2025-01-15 17:32:37 +0900 | |
|---|---|---|
| committer | 2025-01-15 17:42:11 +0900 | |
| commit | c7769d7e7ece747756ba62710ce280cfeaf64af3 (patch) | |
| tree | bd024fbeca3945a6b546558d925b8256745c2f86 /fsgen/filesystem_creator.go | |
| parent | d60d5e1e5df5453da800c3ba145b1a87eb0a2c3a (diff) | |
Make fsverity props configurable
Bug: 381019944
Test: build
Change-Id: I7389131a944ce477d5d49d01acbcacae2e6fecfe
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 9aed460e3..cc369c7dd 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -279,7 +279,7 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true) // Identical to that of the aosp_shared_system_image if partitionVars.ProductFsverityGenerateMetadata { - fsProps.Fsverity.Inputs = []string{ + fsProps.Fsverity.Inputs = proptools.NewSimpleConfigurable([]string{ "etc/boot-image.prof", "etc/dirty-image-objects", "etc/preloaded-classes", @@ -287,8 +287,8 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste "framework/*", "framework/*/*", // framework/{arch} "framework/oat/*/*", // framework/oat/{arch} - } - fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"} + }) + fsProps.Fsverity.Libs = proptools.NewSimpleConfigurable([]string{":framework-res{.export-package.apk}"}) } fsProps.Symlinks = commonSymlinksFromRoot fsProps.Symlinks = append(fsProps.Symlinks, @@ -329,12 +329,12 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste fsProps.Stem = proptools.StringPtr("system.img") case "system_ext": if partitionVars.ProductFsverityGenerateMetadata { - fsProps.Fsverity.Inputs = []string{ + fsProps.Fsverity.Inputs = proptools.NewSimpleConfigurable([]string{ "framework/*", "framework/*/*", // framework/{arch} "framework/oat/*/*", // framework/oat/{arch} - } - fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"} + }) + fsProps.Fsverity.Libs = proptools.NewSimpleConfigurable([]string{":framework-res{.export-package.apk}"}) } fsProps.Security_patch = proptools.StringPtr(ctx.Config().PlatformSecurityPatch()) fsProps.Stem = proptools.StringPtr("system_ext.img") |