diff options
| author | 2015-07-30 16:39:45 -0700 | |
|---|---|---|
| committer | 2015-07-31 16:03:00 -0700 | |
| commit | bc1d78daa463572c5a770cdca858a3b51d8e1b7b (patch) | |
| tree | d33ae78ec8b5e1f9e4b088545e346306d3c4f04e /runtime/oat_file_assistant_test.cc | |
| parent | 8e568d079b052db118d83e6e89ea36ab4fa4bfb1 (diff) | |
runtime: cleanup class_linker out-parameters and formatting
* Use out<T> instead of parameters
* Fixes up some other signatures to be more correct
* Reformat parameters to be one per line if they can't fit on one line
* Reformat locks to be one per line if they can't fit on the decl line
Change-Id: Ib71b08707d3ed0bb85299406c0b23a1de4e92a1c
Diffstat (limited to 'runtime/oat_file_assistant_test.cc')
| -rw-r--r-- | runtime/oat_file_assistant_test.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/runtime/oat_file_assistant_test.cc b/runtime/oat_file_assistant_test.cc index 03ad2d5ac8..65263d0f30 100644 --- a/runtime/oat_file_assistant_test.cc +++ b/runtime/oat_file_assistant_test.cc @@ -26,6 +26,7 @@ #include <gtest/gtest.h> #include "art_field-inl.h" +#include "base/out.h" #include "class_linker-inl.h" #include "common_runtime_test.h" #include "compiler_callbacks.h" @@ -958,7 +959,9 @@ class RaceGenerateTask : public Task { ClassLinker* linker = Runtime::Current()->GetClassLinker(); std::vector<std::unique_ptr<const DexFile>> dex_files; std::vector<std::string> error_msgs; - dex_files = linker->OpenDexFilesFromOat(dex_location_.c_str(), oat_location_.c_str(), &error_msgs); + dex_files = linker->OpenDexFilesFromOat(dex_location_.c_str(), + oat_location_.c_str(), + outof(error_msgs)); CHECK(!dex_files.empty()) << Join(error_msgs, '\n'); CHECK(dex_files[0]->GetOatDexFile() != nullptr) << dex_files[0]->GetLocation(); loaded_oat_file_ = dex_files[0]->GetOatDexFile()->GetOatFile(); |