Rename NativeDexFile -> StandardDexFile
Motivation: The new name is cleaner.
Bug: 63756964
Test: test-art-host
Change-Id: I0e52015dbd929fe247305070cef03d86bcdeb54b
diff --git a/runtime/dex_file_loader.cc b/runtime/dex_file_loader.cc
index 3ccb755..8cab1a5 100644
--- a/runtime/dex_file_loader.cc
+++ b/runtime/dex_file_loader.cc
@@ -27,7 +27,7 @@
#include "base/unix_file/fd_file.h"
#include "dex_file.h"
#include "dex_file_verifier.h"
-#include "native_dex_file.h"
+#include "standard_dex_file.h"
#include "zip_archive.h"
namespace art {
@@ -42,7 +42,7 @@
}
bool DexFileLoader::IsValidMagic(const uint8_t* magic) {
- return NativeDexFile::IsMagicValid(magic);
+ return StandardDexFile::IsMagicValid(magic);
}
bool DexFileLoader::GetMultiDexChecksums(const char* filename,
@@ -450,8 +450,8 @@
*verify_result = VerifyResult::kVerifyNotAttempted;
}
std::unique_ptr<DexFile> dex_file;
- if (NativeDexFile::IsMagicValid(base)) {
- dex_file.reset(new NativeDexFile(base, size, location, location_checksum, oat_dex_file));
+ if (StandardDexFile::IsMagicValid(base)) {
+ dex_file.reset(new StandardDexFile(base, size, location, location_checksum, oat_dex_file));
} else {
return nullptr;
}