diff options
| author | 2024-12-23 18:53:32 +0000 | |
|---|---|---|
| committer | 2024-12-26 23:33:36 +0000 | |
| commit | 6da80750dd80b4ef9d57a7c866c62b7abdafc168 (patch) | |
| tree | 5dada4d3bdc79c16e15507b52c7d1d1e8936ca47 /fsgen/filesystem_creator.go | |
| parent | 56bf39e6762c294c201d13966d8be601f6f520ae (diff) | |
Revert^2 "Make vendor_ramdisk partition install recovery partition files"
This change resubmits https://r.android.com/3425159.
Unlike the original submission, this change does not hash the directory
contents but implicitly depends on the output partition file of the
filesystem module to implement inter-filesystem dependencies.
Test: unpack and diff soong and make generated vendor_ramdisk partitions
Bug: 381104942
Change-Id: I35528cb0dedbeeb7fef3d72df6e008ec0ac9c7bb
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 08685612a..6474397ec 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -78,7 +78,7 @@ func filesystemCreatorFactory() android.Module { return module } -func generatedPartitions(ctx android.LoadHookContext) []string { +func generatedPartitions(ctx android.EarlyModuleContext) []string { partitionVars := ctx.Config().ProductVariables().PartitionVarsForSoongMigrationOnlyDoNotUse generatedPartitions := []string{"system"} if ctx.DeviceConfig().SystemExtPath() == "system_ext" { @@ -373,6 +373,10 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste fsProps.Security_patch = proptools.StringPtr(partitionVars.VendorDlkmSecurityPatch) case "odm_dlkm": fsProps.Security_patch = proptools.StringPtr(partitionVars.OdmDlkmSecurityPatch) + case "vendor_ramdisk": + if android.InList("recovery", generatedPartitions(ctx)) { + fsProps.Include_files_of = []string{generatedModuleNameForPartition(ctx.Config(), "recovery")} + } } } |