diff options
| author | Richard Uhler <ruhler@google.com> | 2015-03-31 15:57:54 -0700 |
|---|---|---|
| committer | Richard Uhler <ruhler@google.com> | 2015-04-02 09:47:03 -0700 |
| commit | 07b3c2351bb527ea91c084dc19434600af9ae66b (patch) | |
| tree | b286122b660ce16abae1e56c57b957b8c69c9531 /runtime/oat_file_assistant_test.cc | |
| parent | dcff612c3a6e1427749771c4559f198fa480f709 (diff) | |
| download | art-07b3c2351bb527ea91c084dc19434600af9ae66b.zip art-07b3c2351bb527ea91c084dc19434600af9ae66b.tar.gz art-07b3c2351bb527ea91c084dc19434600af9ae66b.tar.bz2 | |
Store OatDexFile instead of OatFile in DexFile.
This requires moving OatDexFile out of the OatFile class so that
a forward class declaration can be used for OatDexFile.
Bug: 19071355
Change-Id: Ibda85b78d0577e9e81073090616fc0f2fa526be3
Diffstat (limited to 'runtime/oat_file_assistant_test.cc')
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index a8b0876..a198824 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -787,7 +787,8 @@ class RaceGenerateTask : public Task { std::vector<std::string> error_msgs; dex_files = linker->OpenDexFilesFromOat(dex_location_.c_str(), oat_location_.c_str(), &error_msgs); CHECK(!dex_files.empty()) << Join(error_msgs, '\n'); - loaded_oat_file_ = dex_files[0]->GetOatFile(); + CHECK(dex_files[0]->GetOatDexFile() != nullptr) << dex_files[0]->GetLocation(); + loaded_oat_file_ = dex_files[0]->GetOatDexFile()->GetOatFile(); } const OatFile* GetLoadedOatFile() const { |