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
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 0868561..6474397 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -78,7 +78,7 @@
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 @@
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")}
+ }
}
}