diff options
| author | 2024-10-23 19:32:19 +0000 | |
|---|---|---|
| committer | 2024-10-23 19:32:19 +0000 | |
| commit | 2ea50e17c72dc055a09b0307c3d7789e87a61158 (patch) | |
| tree | 96af8e1e016d465715902edffd0eee9e7e9c0ccf /fsgen/filesystem_creator.go | |
| parent | 1fcf379e62a3078926b7b920530852509e400e97 (diff) | |
| parent | a8fa6b445296eaba7f9509714dc0b0a49b3d5a9f (diff) | |
Merge "Set Fsverity props conditionally" into main
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index fde344b5b..75d2caa40 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -362,6 +362,24 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio fsProps.Build_logtags = proptools.BoolPtr(true) // https://source.corp.google.com/h/googleplex-android/platform/build//639d79f5012a6542ab1f733b0697db45761ab0f3:core/packaging/flags.mk;l=21;drc=5ba8a8b77507f93aa48cc61c5ba3f31a4d0cbf37;bpv=1;bpt=0 fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true) + // Identical to that of the generic_system_image + fsProps.Fsverity.Inputs = []string{ + "etc/boot-image.prof", + "etc/dirty-image-objects", + "etc/preloaded-classes", + "etc/classpaths/*.pb", + "framework/*", + "framework/*/*", // framework/{arch} + "framework/oat/*/*", // framework/oat/{arch} + } + fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"} + case "system_ext": + fsProps.Fsverity.Inputs = []string{ + "framework/*", + "framework/*/*", // framework/{arch} + "framework/oat/*/*", // framework/oat/{arch} + } + fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"} case "product": fsProps.Gen_aconfig_flags_pb = proptools.BoolPtr(true) case "vendor": @@ -441,18 +459,6 @@ func generateFsProps(ctx android.EarlyModuleContext, partitionType string) (*fil fsProps.Is_auto_generated = proptools.BoolPtr(true) - // Identical to that of the generic_system_image - fsProps.Fsverity.Inputs = []string{ - "etc/boot-image.prof", - "etc/dirty-image-objects", - "etc/preloaded-classes", - "etc/classpaths/*.pb", - "framework/*", - "framework/*/*", // framework/{arch} - "framework/oat/*/*", // framework/oat/{arch} - } - fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"} - partitionSpecificFsProps(fsProps, partitionType) // system_image properties that are not set: |