commit f22ca3459d8585c4d2b6b2eaaf9b67f56b4042c7
author Brian Carlstrom <bdc@google.com> Tue Nov 12 13:37:57 2013 -0800
committer Brian Carlstrom <bdc@google.com> Tue Nov 12 13:37:57 2013 -0800
tree 6c93572d8c7fd61d5a2af87a7521bef2e497ed5b
parent 824200b59f303de83c6ebd6fcd958e62117f665d
parent 5f20cf3662d5f7306d27598e42158859f470e98b

resolved conflicts for merge of 5f20cf36 to master

Change-Id: I75b5e5c6cd85dca9a359995f5e608ea633a9cb8a

dex2oat/dex2oat.cc

diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc
index 5b0653e..3781921 100644
--- a/dex2oat/dex2oat.cc
+++ b/dex2oat/dex2oat.cc
@@ -427,6 +427,10 @@
     const char* dex_filename = dex_filenames[i];
     const char* dex_location = dex_locations[i];
     std::string error_msg;
+    if (!OS::FileExists(dex_filename)) {
+      LOG(WARNING) << "Skipping non-existent dex file '" << dex_filename << "'";
+      continue;
+    }
     const DexFile* dex_file = DexFile::Open(dex_filename, dex_location, &error_msg);
     if (dex_file == NULL) {
       LOG(WARNING) << "Failed to open .dex from file '" << dex_filename << "': " << error_msg;