From be26f77dac06fb02b0cc80914b740662bf8d0b26 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Wed, 30 Sep 2015 14:30:19 +0000 Subject: Revert "Fix for gtest missing core classes." This reverts commit fa5480de6eca7f43b147c696bdb2936dc48d75d7. Change-Id: Ifa9851f4f90af6093ed0bca852c55b3026fcd554 --- runtime/common_runtime_test.cc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'runtime/common_runtime_test.cc') 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 CommonRuntimeTest::GetLibCoreDexFileNames() { - return std::vector({GetDexFileName("core-oj"), GetDexFileName("core-libart")}); +std::string CommonRuntimeTest::GetLibCoreDexFileName() { + return GetDexFileName("core-libart"); } std::string CommonRuntimeTest::GetDexFileName(const std::string& jar_prefix) { -- cgit v1.2.3-59-g8ed1b