commit ab7661375c717fdaac1c03f81d9687dfe6a82f78
author Elliott Hughes <enh@google.com> Wed Jan 11 15:16:27 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 11 15:16:27 2012 -0800
tree 2311d9376e275ab080d887c81006ae79493b94be
parent 34c77ad4fc67de52463544b78a35b86d15b496e4
parent fd8cba4ad6d4d0586dc783c031383a9ca953372d

Merge "Log the oat_name, not the oat_filename, on failure." into dalvik-dev

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index 41adc74..24058ec 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -527,7 +527,7 @@
     oat_file.reset(OS::FileFromFd(oat_name.c_str(), oat_fd));
   }
   if (oat_file.get() == NULL) {
-    PLOG(ERROR) << "Unable to create oat file " << oat_name;
+    PLOG(ERROR) << "Unable to create oat file: " << oat_name;
     return EXIT_FAILURE;
   }
 
@@ -578,7 +578,7 @@
       }
       const DexFile* dex_file = DexFile::Open(*zip_archive.get(), zip_name);
       if (dex_file == NULL) {
-        LOG(ERROR) << "Failed to open dex from file descriptor for zip file " << zip_name;
+        LOG(ERROR) << "Failed to open dex from file descriptor for zip file: " << zip_name;
         return EXIT_FAILURE;
       }
       dex_files.push_back(dex_file);
@@ -592,12 +592,12 @@
                               oat_file.get(),
                               image,
                               image_classes.get())) {
-    LOG(ERROR) << "Failed to create oat file" << oat_name;
+    LOG(ERROR) << "Failed to create oat file: " << oat_name;
     return EXIT_FAILURE;
   }
 
   if (!image) {
-    LOG(INFO) << "Oat file written successfully " << oat_filename;
+    LOG(INFO) << "Oat file written successfully: " << oat_name;
     return EXIT_SUCCESS;
   }