From 0f3298a497e32f6c2325a0071124a62d031fae6f Mon Sep 17 00:00:00 2001 From: Doug Zongker Date: Tue, 30 Jun 2009 08:16:58 -0700 Subject: [PATCH] delete source files not in target Incremental OTAs were not removing files from the old build that don't exist in the new build. Fix. --- tools/releasetools/ota_from_target_files | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/releasetools/ota_from_target_files b/tools/releasetools/ota_from_target_files index 547c65c55b..ea4c752ab3 100755 --- a/tools/releasetools/ota_from_target_files +++ b/tools/releasetools/ota_from_target_files @@ -580,7 +580,9 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): script.FormatPartition("userdata") script.Print("Removing unneeded files...") - script.DeleteFiles(["/"+i[0] for i in verbatim_targets]) + script.DeleteFiles(["/"+i[0] for i in verbatim_targets] + + ["/"+i for i in sorted(source_data) + if i not in target_data]) if updating_boot: # Produce the boot image by applying a patch to the current