commit 2f1e15cc3e169ac61b910c41d695e55671c8d4ca
author Brian Carlstrom <bdc@google.com> Mon Oct 27 16:27:06 2014 -0700
committer Brian Carlstrom <bdc@google.com> Mon Oct 27 17:59:03 2014 -0700
tree 1a569b8687659ec4f1c64cf96d146330392cb059
parent 79027f6204f77db4ba3bd3ceab1f07240fbbfdb3

Remove boot.art/boot.oat on failure to create

Bug: 18143314

(cherry picked from commit a6b2affaf99e03f938f6f26e42606488d43f2efe)

Change-Id: Iac6d03d81997911f6707340487a26ee26a3aee27

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 414c5ea..d25bca6 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -115,6 +115,18 @@
   CHECK_EQ(0, TEMP_FAILURE_RETRY(closedir(cache_dir))) << "Unable to close directory.";
 }
 
+static void RemoveImageFiles(const std::string& image_filename, std::string* error_msg) {
+  if (TEMP_FAILURE_RETRY(unlink(image_filename.c_str())) != 0) {
+    *error_msg = StringPrintf("Failed to remove image file after previous error: %s",
+                              error_msg->c_str());
+  }
+  std::string oat_filename(ImageHeader::GetOatLocationFromImageLocation(image_filename));
+  if (TEMP_FAILURE_RETRY(unlink(oat_filename.c_str())) != 0) {
+    *error_msg = StringPrintf("Failed to remove oat file after previous error: %s",
+                              error_msg->c_str());
+  }
+}
+
 static bool GenerateImage(const std::string& image_filename, InstructionSet image_isa,
                           std::string* error_msg) {
   const std::string boot_class_path_string(Runtime::Current()->GetBootClassPathString());
@@ -144,9 +156,7 @@
   }
 
   std::string oat_file_option_string("--oat-file=");
-  oat_file_option_string += image_filename;
-  oat_file_option_string.erase(oat_file_option_string.size() - 3);
-  oat_file_option_string += "oat";
+  oat_file_option_string += ImageHeader::GetOatLocationFromImageLocation(image_filename);
   arg_vector.push_back(oat_file_option_string);
 
   Runtime::Current()->AddCurrentRuntimeFeaturesAsDex2OatArguments(&arg_vector);
@@ -435,6 +445,7 @@
             *error_msg = StringPrintf("Unable to relocate image '%s' from '%s' to '%s': %s",
                                       image_location, system_filename.c_str(),
                                       cache_filename.c_str(), reason.c_str());
+            RemoveImageFiles(cache_filename, error_msg);
             return nullptr;
           }
         }
@@ -509,6 +520,7 @@
   } else if (!GenerateImage(cache_filename, image_isa, error_msg)) {
     *error_msg = StringPrintf("Failed to generate image '%s': %s",
                               cache_filename.c_str(), error_msg->c_str());
+    RemoveImageFiles(cache_filename, error_msg);
     return nullptr;
   } else {
     // Note that we must not use the file descriptor associated with