commit 292567ee71a20bfc59513c6af290495e4b92b2cb
author Mathieu Chartier <mathieuc@google.com> Thu Oct 12 13:24:38 2017 -0700
committer Mathieu Chartier <mathieuc@google.com> Thu Oct 12 13:48:31 2017 -0700
tree 6f2fb5ed3caec12b2193b179864dcd87578d2f52
parent b95f45e67a3e4a14aab63b19f101547658d7514b

Rename NativeDexFile -> StandardDexFile

Motivation: The new name is cleaner.

Bug: 63756964
Test: test-art-host
Change-Id: I0e52015dbd929fe247305070cef03d86bcdeb54b

runtime/class_linker_test.cc

diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc
index 3d9fd59..6ea1fbe 100644
--- a/runtime/class_linker_test.cc
+++ b/runtime/class_linker_test.cc
@@ -26,7 +26,6 @@
 #include "base/enums.h"
 #include "class_linker-inl.h"
 #include "common_runtime_test.h"
-#include "native_dex_file.h"
 #include "dex_file_types.h"
 #include "entrypoints/entrypoint_utils-inl.h"
 #include "experimental_flags.h"
@@ -50,6 +49,7 @@
 #include "mirror/stack_trace_element.h"
 #include "mirror/string-inl.h"
 #include "scoped_thread_state_change-inl.h"
+#include "standard_dex_file.h"
 #include "thread-current-inl.h"
 
 namespace art {
@@ -1462,11 +1462,11 @@
   dex_cache->SetLocation(location.Get());
   const DexFile* old_dex_file = dex_cache->GetDexFile();
 
-  std::unique_ptr<DexFile> dex_file(new NativeDexFile(old_dex_file->Begin(),
-                                                      old_dex_file->Size(),
-                                                      location->ToModifiedUtf8(),
-                                                      0u,
-                                                      nullptr));
+  std::unique_ptr<DexFile> dex_file(new StandardDexFile(old_dex_file->Begin(),
+                                                        old_dex_file->Size(),
+                                                        location->ToModifiedUtf8(),
+                                                        0u,
+                                                        nullptr));
   {
     WriterMutexLock mu(soa.Self(), *Locks::dex_lock_);
     // Check that inserting with a UTF16 name works.