diff options
| author | 2014-07-09 07:58:38 +0000 | |
|---|---|---|
| committer | 2014-07-02 20:49:53 +0000 | |
| commit | 8078b294e8001abff5a6c8637e844b55a65fff4b (patch) | |
| tree | d23d8693bdc9d7bf155582850461c8c086c5bbcb /runtime/class_linker.cc | |
| parent | 608520c8ba1adc7d8d0623b021b7ea509b00751c (diff) | |
| parent | 452bee5da9811f62123978e142bd67b385e9ff82 (diff) | |
Merge "Revert "ART: Key-Value Store in Oat header""
Diffstat (limited to 'runtime/class_linker.cc')
| -rw-r--r-- | runtime/class_linker.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index 860cbd207e..5180e34313 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -1159,9 +1159,7 @@ void ClassLinker::InitFromImage() { OatFile& oat_file = GetImageOatFile(space); CHECK_EQ(oat_file.GetOatHeader().GetImageFileLocationOatChecksum(), 0U); CHECK_EQ(oat_file.GetOatHeader().GetImageFileLocationOatDataBegin(), 0U); - const char* image_file_location = oat_file.GetOatHeader(). - GetStoreValueByKey(OatHeader::kImageLocationKey); - CHECK(image_file_location == nullptr || *image_file_location == 0); + CHECK(oat_file.GetOatHeader().GetImageFileLocation().empty()); portable_resolution_trampoline_ = oat_file.GetOatHeader().GetPortableResolutionTrampoline(); quick_resolution_trampoline_ = oat_file.GetOatHeader().GetQuickResolutionTrampoline(); portable_imt_conflict_trampoline_ = oat_file.GetOatHeader().GetPortableImtConflictTrampoline(); |