diff options
Diffstat (limited to 'runtime/common_runtime_test.cc')
-rw-r--r-- | runtime/common_runtime_test.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index 5172fbef4b..c299210461 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -197,11 +197,8 @@ void CommonRuntimeTest::SetUp() { MemMap::Init(); // For LoadExpectSingleDexFile std::string error_msg; - - for (const std::string &core_dex_file_name : GetLibCoreDexFileNames()) { - java_lang_dex_file_ = LoadExpectSingleDexFile(core_dex_file_name.c_str()); - boot_class_path_.push_back(java_lang_dex_file_); - } + java_lang_dex_file_ = LoadExpectSingleDexFile(GetLibCoreDexFileName().c_str()); + boot_class_path_.push_back(java_lang_dex_file_); std::string min_heap_string(StringPrintf("-Xms%zdm", gc::Heap::kDefaultInitialSize / MB)); std::string max_heap_string(StringPrintf("-Xmx%zdm", gc::Heap::kDefaultMaximumSize / MB)); @@ -286,8 +283,8 @@ void CommonRuntimeTest::TearDown() { Runtime::Current()->GetHeap()->VerifyHeap(); // Check for heap corruption after the test } -std::vector<std::string> CommonRuntimeTest::GetLibCoreDexFileNames() { - return std::vector<std::string>({GetDexFileName("core-oj"), GetDexFileName("core-libart")}); +std::string CommonRuntimeTest::GetLibCoreDexFileName() { + return GetDexFileName("core-libart"); } std::string CommonRuntimeTest::GetDexFileName(const std::string& jar_prefix) { |