Don't add recovery partition to android_device...
...if it's only created for the vendor_boot image. This makes it so
the android_device won't build the recovery partition unnecessarily,
and makes it easier to make a diff test that compares
soong-only/soong+make, because soong+make doesn't build the recovery
partition.
Bug: 376539388
Test: build and see that there's no recovery.img in out/soong/.intermediates/build/soong/fsgen/aosp_cf_x86_64_phone_generated_device/android_x86_64_silvermont/all_images.zip
Change-Id: Id92c4e7d22279e17ee695bbed041eba2bce52ad0
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index c2721d2..e2485a1 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -377,7 +377,7 @@
if modName := partitions.nameForType("userdata"); modName != "" {
partitionProps.Userdata_partition_name = proptools.StringPtr(modName)
}
- if modName := partitions.nameForType("recovery"); modName != "" {
+ if modName := partitions.nameForType("recovery"); modName != "" && !ctx.DeviceConfig().BoardMoveRecoveryResourcesToVendorBoot() {
partitionProps.Recovery_partition_name = proptools.StringPtr(modName)
}
if modName := partitions.nameForType("system_dlkm"); modName != "" && !android.InList("system_dlkm", superImageSubPartitions) {