Revert "Allow boot image for a part of the boot classpath."

This reverts commit 4433c4351aab98005e12a6b53905678758b74665.

Reason for revert: May be breaking tests.

Change-Id: I3b690dbb06278dc1adce5a389fff938a692bdebd

1 files changed, 2 insertions, 5 deletions

diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index 4e38490dc6..278203da23 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -329,18 +329,15 @@ static std::string GetDexFileName(const std::string& jar_prefix, bool host) {
 }
 
 std::vector<std::string> CommonArtTestImpl::GetLibCoreDexFileNames() {
-  // Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
+  // Note: This must match the TEST_CORE_JARS in Android.common_path.mk
   // because that's what we use for compiling the core.art image.
-  // It may contain additional modules from TEST_CORE_JARS.
   static const char* const kLibcoreModules[] = {
-      // CORE_IMG_JARS modules.
       "core-oj",
       "core-libart",
       "core-simple",
+      "conscrypt",
       "okhttp",
       "bouncycastle",
-      // Additional modules.
-      "conscrypt",
   };
 
   std::vector<std::string> result;