From 2c7e13b120926d3c3c18d649cd9849ea31b81477 Mon Sep 17 00:00:00 2001
From: Mathieu Chartier <mathieuc@google.com>
Date: Fri, 11 May 2018 19:40:17 +0000
Subject: Revert "Do not load app image for class collisions"

This reverts commit d8860b42e47d48fcc47db9d0daf5a1b9432180a1.

Bug: 77342775
Bug: 79200502
Bug: 79575750

Reason for revert: Some regressions in boot time.
Test: test-art-host

Change-Id: Id5e5844b5156d048a54011708378c7cdb0650f68
---
 runtime/oat_file_assistant.cc | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'runtime/oat_file_assistant.cc')

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()
-- 
cgit v1.2.3-59-g8ed1b