commit 89521898b56f2ebc3fb68acfb6bc6dde9b6f5c38
author Brian Carlstrom <bdc@google.com> Wed Dec 07 22:05:07 2011 -0800
committer Brian Carlstrom <bdc@google.com> Wed Jan 04 00:23:07 2012 -0800
tree 6811878efd4490f78ae099ec7e14c1a1ffe4d868
parent c74a6971fb9a65dbee337d51e7981a37be208a00

Merge art-cache dex files into oat files

Change-Id: I5a327a4e0b678bd9dabb12de4e21ef05e3fefd0b

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 5a3887a..e3b30d7 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -733,7 +733,6 @@
 }
 
 void ClassLinker::InitFromImage() {
-  const Runtime* runtime = Runtime::Current();
   VLOG(startup) << "ClassLinker::InitFromImage entering";
   CHECK(!init_done_);
 
@@ -759,17 +758,13 @@
       for (int i = 0; i < dex_caches->GetLength(); i++) {
         SirtRef<DexCache> dex_cache(dex_caches->Get(i));
         const std::string& dex_file_location(dex_cache->GetLocation()->ToModifiedUtf8());
-
-        std::string dex_filename;
-        dex_filename += runtime->GetHostPrefix();
-        dex_filename += dex_file_location;
-        const DexFile* dex_file = DexFile::Open(dex_filename, runtime->GetHostPrefix());
+        const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file_location);
+        const DexFile* dex_file = oat_dex_file->OpenDexFile();
         if (dex_file == NULL) {
-          LOG(FATAL) << "Failed to open dex file " << dex_filename
-                     << " referenced from oat file as " << dex_file_location;
+          LOG(FATAL) << "Failed to open dex file " << dex_file_location
+                     << " from within oat file " << oat_file->GetLocation();
         }
 
-        const OatFile::OatDexFile* oat_dex_file = oat_file->GetOatDexFile(dex_file_location);
         CHECK_EQ(dex_file->GetHeader().checksum_, oat_dex_file->GetDexFileChecksum());
 
         AppendToBootClassPath(*dex_file, dex_cache);
@@ -1789,7 +1784,7 @@
       SirtRef<Method> prototype(methods->Get(i));
       CheckProxyMethod(klass->GetVirtualMethod(i), prototype);
     }
-    std::string throws_field_name = "java.lang.Class[][] ";
+    std::string throws_field_name("java.lang.Class[][] ");
     throws_field_name += name->ToModifiedUtf8();
     throws_field_name += ".throws";
     CHECK(PrettyField(klass->GetStaticField(0)) == throws_field_name);