1 files changed, 11 insertions, 39 deletions
diff --git a/src/dex_file.cc b/src/dex_file.cc
index 6cb8258aa1..e3c8fa0919 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -1,47 +1,19 @@
 // Copyright 2011 Google Inc. All Rights Reserved.
 
-#include "src/dex_file.h"
-#include "src/heap.h"
-#include "src/globals.h"
-#include "src/logging.h"
-#include "src/object.h"
-#include "src/raw_dex_file.h"
+#include "dex_file.h"
+#include "heap.h"
+#include "globals.h"
+#include "logging.h"
+#include "object.h"
+#include "raw_dex_file.h"
 
 namespace art {
 
-DexFile* DexFile::OpenFile(const char* filename) {
-  RawDexFile* raw = RawDexFile::OpenFile(filename);
-  return Open(raw);
-}
-
-DexFile* DexFile::Open(RawDexFile* raw) {
-  if (raw == NULL) {
-    return NULL;
-  }
-  DexFile* dex_file = new DexFile(raw);
-  dex_file->Init();
-  return dex_file;
-}
-
-DexFile::~DexFile() {
-  delete[] strings_;
-  delete[] classes_;
-  delete[] methods_;
-  delete[] fields_;
-}
-
-void DexFile::Init() {
-  num_strings_ = raw_->NumStringIds();
-  strings_ = new String*[num_strings_]();
-
-  num_classes_ = raw_->NumTypeIds();
-  classes_ = new Class*[num_classes_]();
-
-  num_methods_ = raw_->NumMethodIds();
-  methods_ = new Method*[num_methods_]();
-
-  num_fields_ = raw_->NumFieldIds();
-  fields_ = new Field*[num_fields_]();
+void DexFile::Init(ObjectArray* strings, ObjectArray* classes, ObjectArray* methods, ObjectArray* fields) {
+  Set(kStrings, strings);
+  Set(kClasses, classes);
+  Set(kMethods, methods);
+  Set(kFields,  fields);
 }
 
 }  // namespace art