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

This reverts commit fb83d76a8b186df05f874216b535f5ad57e7bd02.

Fixed host run-test dependencies, cleaned up target run-test
and gtest dependencies.

Test: rm -f out/host/linux-x86/framework/conscrypt-hostdex.jar
      testrunner.py -b --host --optimizing -t 660-clinit
Bug: 119868597
Change-Id: Ia0a5aba0223ae6616bf3e109daf0af7b8355d048

1 files changed, 5 insertions, 2 deletions

diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index f292303ded..46724eec9f 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -328,15 +328,18 @@ static std::string GetDexFileName(const std::string& jar_prefix, bool host) {
 }
 
 std::vector<std::string> CommonArtTestImpl::GetLibCoreDexFileNames() {
-  // Note: This must match the TEST_CORE_JARS in Android.common_path.mk
+  // Note: This must start with the CORE_IMG_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;