diff options
| author | 2025-01-15 18:05:41 -0800 | |
|---|---|---|
| committer | 2025-01-15 18:05:41 -0800 | |
| commit | c45a48031fd3f0100b27578540b03d4665556889 (patch) | |
| tree | ca581f0f9354cd19364562711e5f5d6099f12ac0 /fsgen/filesystem_creator.go | |
| parent | 23e7cfc243822d57212bd499c212c8041b6eb71e (diff) | |
| parent | c7769d7e7ece747756ba62710ce280cfeaf64af3 (diff) | |
Merge "Make fsverity props configurable" into main
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 fbe907898..d00ebb217 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -281,7 +281,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", @@ -289,8 +289,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, @@ -331,12 +331,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") |