summaryrefslogtreecommitdiff
path: root/fsgen/filesystem_creator.go
diff options
context:
space:
mode:
author mrziwang <mrziwang@google.com> 2024-11-05 14:29:48 -0800
committer Zi Wang <mrziwang@google.com> 2024-11-06 20:42:24 +0000
commit9afc298e4f89ca4e33497dc040b7d417a9174ba9 (patch)
treeb14cec763acce9ef12e174fa1305cd9b4064196a /fsgen/filesystem_creator.go
parentb31472422a17e0ba0f878dca50f9b834e9f71426 (diff)
Handle several symlinks in system image generation
The symlinks below are added in fsProps: system/product to /product system/system_ext to /system_ext system/vendor to /vendor system/lib/modules to /system_dlkm/lib/modules Test: CI and soong_generated_system_filesystem_test Bug: 376490670 Change-Id: Ia1594e27593fce2e34e9601bc0516892fc33a3f7
Diffstat (limited to 'fsgen/filesystem_creator.go')
-rw-r--r--fsgen/filesystem_creator.go20
1 files changed, 20 insertions, 0 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index bdffabf41..528263638 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -136,6 +136,26 @@ func partitionSpecificFsProps(fsProps *filesystem.FilesystemProperties, partitio
"framework/oat/*/*", // framework/oat/{arch}
}
fsProps.Fsverity.Libs = []string{":framework-res{.export-package.apk}"}
+ // TODO(b/377734331): only generate the symlinks if the relevant partitions exist
+ fsProps.Symlinks = []filesystem.SymlinkDefinition{
+ filesystem.SymlinkDefinition{
+ Target: proptools.StringPtr("/product"),
+ Name: proptools.StringPtr("system/product"),
+ },
+ filesystem.SymlinkDefinition{
+ Target: proptools.StringPtr("/system_ext"),
+ Name: proptools.StringPtr("system/system_ext"),
+ },
+ filesystem.SymlinkDefinition{
+ Target: proptools.StringPtr("/vendor"),
+ Name: proptools.StringPtr("system/vendor"),
+ },
+ filesystem.SymlinkDefinition{
+ Target: proptools.StringPtr("/system_dlkm/lib/modules"),
+ Name: proptools.StringPtr("system/lib/modules"),
+ },
+ }
+ fsProps.Base_dir = proptools.StringPtr("system")
case "system_ext":
fsProps.Fsverity.Inputs = []string{
"framework/*",