am 8fead691: Merge change 22448 into donut
Merge commit '8fead6912ed3f04867974631935435a887ed889d' into eclair
* commit '8fead6912ed3f04867974631935435a887ed889d':
incremental OTAs should remove /system/recovery.img
diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files
index dbb38f2..56cf526 100755
--- a/tools/releasetools/ota_from_target_files
+++ b/tools/releasetools/ota_from_target_files
@@ -626,7 +626,8 @@
script.Print("Removing unneeded files...")
script.DeleteFiles(["/"+i[0] for i in verbatim_targets] +
["/"+i for i in sorted(source_data)
- if i not in target_data])
+ if i not in target_data] +
+ ["/system/recovery.img"])
if updating_boot:
# Produce the boot image by applying a patch to the current