Refactor code around the verifier.

- For classes that are not resolved, we were doing verification but were
  not recording the outcome - fix that.
- Clear the verifier deps (for space reasons) only when a class is hard
  fail or needs to be verified at runtime.

Test: test.py
Bug: 176960283
Change-Id: If19c0e6171ce945a6cd56ba4a42fbb8e2a5ccee7

1 files changed, 2 insertions, 2 deletions

diff --git a/runtime/module_exclusion_test.cc b/runtime/module_exclusion_test.cc
index 1f5f87ef2b..b62fc01522 100644
--- a/runtime/module_exclusion_test.cc
+++ b/runtime/module_exclusion_test.cc
@@ -178,14 +178,14 @@ TEST_F(ConscryptExclusionTest, Test) {
                                                    jar_name,
                                                    &error_msg));
   ASSERT_TRUE(odex_file != nullptr) << error_msg;
-  // Check that no classes have been resolved.
+  // Check that no classes have been initialized.
   for (const OatDexFile* oat_dex_file : odex_file->GetOatDexFiles()) {
     std::unique_ptr<const DexFile> dex_file = oat_dex_file->OpenDexFile(&error_msg);
     ASSERT_TRUE(dex_file != nullptr);
     for (size_t i = 0, num_class_defs = dex_file->NumClassDefs(); i != num_class_defs; ++i) {
       ClassStatus status = oat_dex_file->GetOatClass(i).GetStatus();
       ASSERT_FALSE(mirror::Class::IsErroneous(status));
-      ASSERT_LT(status, ClassStatus::kResolved);
+      ASSERT_LE(status, ClassStatus::kVerified);
     }
   }
 }