commit 9ea1cb1a22be5b85dc2622e3836c46a1c48e3f25
author Brian Carlstrom <bdc@google.com> Wed Aug 24 23:18:18 2011 -0700
committer Brian Carlstrom <bdc@google.com> Thu Aug 25 09:45:07 2011 -0700
tree 99dd5c0b0a3e6db3f8696197467ae4fec284bec2
parent 04ec7f0f244ef36fac1c7e590d2ea14e35dfe95a

First pass of compiler wrapping class

Change-Id: I343625310f69cc4de315af91b9cc72bb4da8f59b

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index a405ce5..1b0404e 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -444,10 +444,9 @@
 
     java_lang_dex_file_.reset(GetLibCoreDex());
 
-    std::vector<const DexFile*> boot_class_path;
-    boot_class_path.push_back(java_lang_dex_file_.get());
+    boot_class_path_.push_back(java_lang_dex_file_.get());
 
-    runtime_.reset(Runtime::Create(boot_class_path));
+    runtime_.reset(Runtime::Create(boot_class_path_));
     ASSERT_TRUE(runtime_ != NULL);
     class_linker_ = runtime_->GetClassLinker();
   }
@@ -505,16 +504,18 @@
   }
 
   PathClassLoader* AllocPathClassLoader(const DexFile* dex_file) {
-    class_linker_->RegisterDexFile(dex_file);
+    CHECK(dex_file != NULL);
+    class_linker_->RegisterDexFile(*dex_file);
     std::vector<const DexFile*> dex_files;
     dex_files.push_back(dex_file);
-    return class_linker_->AllocPathClassLoader(dex_files);
+    return PathClassLoader::Alloc(dex_files);
   }
 
   bool is_host_;
   scoped_ptr_malloc<char> android_data_;
   std::string art_cache_;
   scoped_ptr<const DexFile> java_lang_dex_file_;
+  std::vector<const DexFile*> boot_class_path_;
   scoped_ptr<Runtime> runtime_;
   ClassLinker* class_linker_;
 };