commit 5b8e6e36e96d6d1921dd356fa46191d1e6a18082
author Przemyslaw Szczepaniak <pszczepaniak@google.com> Wed Sep 30 14:40:33 2015 +0100
committer Narayan Kamath <narayan@google.com> Thu Nov 12 10:15:58 2015 +0000
tree 33d66d1cb3377447aa687ee4625c5826370d1e85
parent be26f77dac06fb02b0cc80914b740662bf8d0b26

Fix for gtest missing core classes, attempt 2

common_runtime_test loads both core-libart and
core-oj

Change-Id: I8a4d5750b99aed2e500cad89b841a57fe9c1ca69

runtime/zip_archive_test.cc

diff --git a/runtime/zip_archive_test.cc b/runtime/zip_archive_test.cc
index 70a4dda..ced47e3 100644
--- a/runtime/zip_archive_test.cc
+++ b/runtime/zip_archive_test.cc
@@ -32,7 +32,7 @@
 
 TEST_F(ZipArchiveTest, FindAndExtract) {
   std::string error_msg;
-  std::unique_ptr<ZipArchive> zip_archive(ZipArchive::Open(GetLibCoreDexFileName().c_str(), &error_msg));
+  std::unique_ptr<ZipArchive> zip_archive(ZipArchive::Open(GetLibCoreDexFileNames()[0].c_str(), &error_msg));
   ASSERT_TRUE(zip_archive.get() != nullptr) << error_msg;
   ASSERT_TRUE(error_msg.empty());
   std::unique_ptr<ZipEntry> zip_entry(zip_archive->Find("classes.dex", &error_msg));