Merge pull request #71 from Pehrsons/b2g-4.4.2_r1_bug1058511

Bug 1058511 - Clear Gecko HTTP cache before checking free cache space. r=gerard-majax

tools/releasetools/edify_generator.py

@@ -184,6 +184,12 @@ def DeleteFiles(self, file_list):
     cmd = "delete(" + ",\0".join(['"%s"' % (i,) for i in file_list]) + ");"
     self.script.append(self._WordWrap(cmd))
 
+  def DeleteFilesRecursive(self, file_list):
+    """Recursively delete all files and folders in file_list."""
+    if not file_list: return
+    cmd = "delete_recursive(" + ",\0".join(['"%s"' % (i,) for i in file_list]) + ");"
+    self.script.append(self._WordWrap(cmd))
+
   def RenameFile(self, srcfile, tgtfile):
     """Moves a file from one location to another."""
     if self.info.get("update_rename_support", False):

tools/releasetools/ota_from_target_files

@@ -650,6 +650,13 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip):
     script.SetProgress(so_far / total_verify_size)
 
   if patch_list or updating_recovery or updating_boot:
+    # We clear Gecko's HTTP cache before the regular space check.
+    # During CacheFreeSpaceCheck(), the update-binary tries to clear files in
+    # /cache to free up the desired space. However, update-binary does not
+    # see the Gecko HTTP cache as safe to delete so it won't be touched.
+    script.Print("Clearing Gecko HTTP cache...")
+    script.DeleteFilesRecursive(["/cache/Cache"])
+    script.DeleteFilesRecursive(["/cache/cache2"])
     script.CacheFreeSpaceCheck(largest_source_size)
 
   device_specific.IncrementalOTA_VerifyEnd()