Revert "Disable DCHECK's that break cdex-redefine-stress tests." am: 7690e48b61

Original change: https://android-review.googlesource.com/c/platform/art/+/2197015

Change-Id: I67589c282f7439bcb7257e44085c96b0e79d4d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/runtime/oat_file_assistant_context.cc b/runtime/oat_file_assistant_context.cc
index 2debce1..d282d03 100644
--- a/runtime/oat_file_assistant_context.cc
+++ b/runtime/oat_file_assistant_context.cc
@@ -74,17 +74,13 @@
   std::vector<std::string>* current_bcp_checksums = nullptr;
   for (const DexFile* dex_file : runtime->GetClassLinker()->GetBootClassPath()) {
     if (!DexFileLoader::IsMultiDexLocation(dex_file->GetLocation().c_str())) {
-      // TODO(b/243128839): Investigate why this doesn't hold for
-      // cdex-redefine-stress tests.
-      // DCHECK_LT(bcp_index, runtime_options_->boot_class_path.size());
+      DCHECK_LT(bcp_index, runtime_options_->boot_class_path.size());
       current_bcp_checksums = &bcp_checksums_by_index_[bcp_index++];
     }
     DCHECK_NE(current_bcp_checksums, nullptr);
     current_bcp_checksums->push_back(StringPrintf("/%08x", dex_file->GetLocationChecksum()));
   }
-  // TODO(b/243128839): Investigate why this doesn't hold for
-  // cdex-redefine-stress tests.
-  // DCHECK_EQ(bcp_index, runtime_options_->boot_class_path.size());
+  DCHECK_EQ(bcp_index, runtime_options_->boot_class_path.size());
 
   // Fetch APEX versions from the runtime.
   apex_versions_ = runtime->GetApexVersions();