summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Calin Juravle <calin@google.com> 2014-09-05 15:26:00 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-09-05 15:26:00 +0000
commit5123285945f309dc7293a860bcae2bc724540fed (patch)
tree17ca4770b299f41045e1e820840eafd255d4b12b
parent194b032b6d43299e117292494064d54ecf4ddbd8 (diff)
parenta8c55ae449ad423087f232b2fec1064062755970 (diff)
Merge "Remove unreachable code from class_linker.cc"
-rw-r--r--runtime/class_linker.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index ad436d0d91..ca97b08e15 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1189,13 +1189,7 @@ bool ClassLinker::VerifyOatAndDexFileChecksums(const OatFile* oat_file,
return false;
}
- if (dex_location_checksum != oat_dex_file->GetDexFileLocationChecksum()) {
- *error_msg = StringPrintf("oat file '%s' mismatch (0x%x) with '%s' (0x%x)",
- oat_file->GetLocation().c_str(),
- oat_dex_file->GetDexFileLocationChecksum(),
- dex_location, dex_location_checksum);
- return false;
- }
+ DCHECK_EQ(dex_location_checksum, oat_dex_file->GetDexFileLocationChecksum());
return true;
}