Revert "Add DEX SHA1 to oat files."

This reverts commit ba2222f1e114603b42dfdb6dd1d11012d32a2739.

Reason for revert: breaking aosp cf targets b/292059778

Bug:292059778
Change-Id: Ia26f8e297a2eb8455df759e92490789f08b41906

1 files changed, 1 insertions, 3 deletions

diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index f307d71996..eb75c6bdaf 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1824,7 +1824,7 @@ static std::unique_ptr<const DexFile> OpenOatDexFile(const OatFile* oat_file,
     REQUIRES_SHARED(Locks::mutator_lock_) {
   DCHECK(error_msg != nullptr);
   std::unique_ptr<const DexFile> dex_file;
-  const OatDexFile* oat_dex_file = oat_file->GetOatDexFile(location, error_msg);
+  const OatDexFile* oat_dex_file = oat_file->GetOatDexFile(location, nullptr, error_msg);
   if (oat_dex_file == nullptr) {
     return std::unique_ptr<const DexFile>();
   }
@@ -1839,14 +1839,12 @@ static std::unique_ptr<const DexFile> OpenOatDexFile(const OatFile* oat_file,
   }
 
   if (dex_file->GetLocationChecksum() != oat_dex_file->GetDexFileLocationChecksum()) {
-    CHECK(dex_file->GetSha1() != oat_dex_file->GetSha1());
     *error_msg = StringPrintf("Checksums do not match for %s: %x vs %x",
                               location,
                               dex_file->GetLocationChecksum(),
                               oat_dex_file->GetDexFileLocationChecksum());
     return std::unique_ptr<const DexFile>();
   }
-  CHECK(dex_file->GetSha1() == oat_dex_file->GetSha1());
   return dex_file;
 }