diff options
| author | 2018-05-11 20:02:16 +0000 | |
|---|---|---|
| committer | 2018-05-11 20:02:16 +0000 | |
| commit | 54c42cea2b73e664c36fc4efaa28a33aea39b97c (patch) | |
| tree | 74766773ba254c40b44b53012156061ff2527c88 /runtime/oat_file_assistant.cc | |
| parent | b12c46f8382ca939f55abc0c20fb48fb17b2c1be (diff) | |
| parent | 2c7e13b120926d3c3c18d649cd9849ea31b81477 (diff) | |
Merge "Revert "Do not load app image for class collisions""
Diffstat (limited to 'runtime/oat_file_assistant.cc')
| -rw-r--r-- | runtime/oat_file_assistant.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc index 241102ea83..9c8b6512a7 100644 --- a/runtime/oat_file_assistant.cc +++ b/runtime/oat_file_assistant.cc @@ -1217,9 +1217,7 @@ bool OatFileAssistant::OatFileInfo::ClassLoaderContextIsOkay(ClassLoaderContext* return false; } - - bool result = context->VerifyClassLoaderContextMatch(file->GetClassLoaderContext()) == - ClassLoaderContext::VerificationResult::kVerifies; + bool result = context->VerifyClassLoaderContextMatch(file->GetClassLoaderContext()); if (!result) { VLOG(oat) << "ClassLoaderContext check failed. Context was " << file->GetClassLoaderContext() |