diff options
| author | 2015-11-12 11:49:06 +0000 | |
|---|---|---|
| committer | 2015-11-12 11:52:42 +0000 | |
| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 (patch) | |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 /runtime/dex_file_test.cc | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 (diff) | |
Merge lmp changes into mnc.
Most merge conflicts are due to changes in the string representation.
They have been resolved in favour of "mnc-dev" since we've changed
the string representation there. Other changes relate to the
fact that there are now two jars in libcore (core-oj and core-libart).
Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433
Diffstat (limited to 'runtime/dex_file_test.cc')
| -rw-r--r-- | runtime/dex_file_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/dex_file_test.cc b/runtime/dex_file_test.cc index 90b35a3e04..ef66bd9dcb 100644 --- a/runtime/dex_file_test.cc +++ b/runtime/dex_file_test.cc @@ -206,7 +206,7 @@ TEST_F(DexFileTest, GetChecksum) { uint32_t checksum; ScopedObjectAccess soa(Thread::Current()); std::string error_msg; - EXPECT_TRUE(DexFile::GetChecksum(GetLibCoreDexFileName().c_str(), &checksum, &error_msg)) + EXPECT_TRUE(DexFile::GetChecksum(GetLibCoreDexFileNames()[0].c_str(), &checksum, &error_msg)) << error_msg; EXPECT_EQ(java_lang_dex_file_->GetLocationChecksum(), checksum); } |