commit 58ae9416e197ae68ed12ed43d87407d4dfb15093
author Brian Carlstrom <bdc@google.com> Tue Oct 04 00:56:06 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 04 10:39:42 2011 -0700
tree 9fa93ce844f931155bf4a1d060f091f3285fb205
parent 4d0207c3ed28bbbb8c583a3c3a37f00d1cd4dedc

Simplify command line arguments

Change-Id: I9d6902b0c447fd8fbe5600fd36139791b2ceefb7

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index a7c5ea8..b321071 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -43,7 +43,7 @@
   file.reset();
 
   // read dex file
-  const DexFile* dex_file = DexFile::OpenFile(location, location, "");
+  const DexFile* dex_file = DexFile::Open(location, "");
   CHECK(dex_file != NULL);
   return dex_file;
 }
@@ -114,10 +114,12 @@
 
     java_lang_dex_file_.reset(GetLibCoreDex());
 
-    boot_class_path_.push_back(java_lang_dex_file_.get());
+    std::string boot_class_path;
+    boot_class_path += "-Xbootclasspath:";
+    boot_class_path += GetLibCoreDexFileName();
 
     Runtime::Options options;
-    options.push_back(std::make_pair("bootclasspath", &boot_class_path_));
+    options.push_back(std::make_pair(boot_class_path.c_str(), reinterpret_cast<void*>(NULL)));
     options.push_back(std::make_pair("-Xcheck:jni", reinterpret_cast<void*>(NULL)));
     options.push_back(std::make_pair("-Xms64m", reinterpret_cast<void*>(NULL)));
     options.push_back(std::make_pair("-Xmx64m", reinterpret_cast<void*>(NULL)));
@@ -193,7 +195,7 @@
 
   const DexFile* GetLibCoreDex() {
     std::string libcore_dex_file_name = GetLibCoreDexFileName();
-    return DexFile::OpenZip(libcore_dex_file_name, "");
+    return DexFile::Open(libcore_dex_file_name, "");
   }
 
   uint32_t FindTypeIdxByDescriptor(const DexFile& dex_file, const StringPiece& descriptor) {
@@ -239,7 +241,7 @@
     filename += "/system/framework/art-test-dex-";
     filename += name;
     filename += ".jar";
-    const DexFile* dex_file = DexFile::OpenZip(filename, "");
+    const DexFile* dex_file = DexFile::Open(filename, "");
     CHECK(dex_file != NULL) << "Failed to open " << filename;
     return dex_file;
   }