Revert^4 "Generate a primary boot image for testing."

This reverts commit c9607e3cebb5fa942fec1d40b4a36a31ca5fb7c7.

Reason for revert: Fixed LUCI tests by not relying on any environment
variable.

Bug: 216467764
Test: Run art/tools/run-gtests.sh on Cuttlefish.
Change-Id: I20e2d27a5d7f9e0938bd09d58a2fb5b350c0c5ad

1 files changed, 1 insertions, 7 deletions

diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc
index e8c8385066..a14d3862ad 100644
--- a/runtime/common_runtime_test.cc
+++ b/runtime/common_runtime_test.cc
@@ -99,13 +99,7 @@ void CommonRuntimeTestImpl::SetUp() {
   options.push_back(std::make_pair(boot_class_path_string, nullptr));
   options.push_back(std::make_pair(boot_class_path_locations_string, nullptr));
   if (use_boot_image_) {
-    std::string image_location = GetImageLocation();
-    if (!IsHost()) {
-      // On target, the boot image can be outdated due to an ART update. In such case, the profile
-      // will be used for generating a boot image in memory.
-      image_location += "!/apex/com.android.art/etc/boot-image.prof";
-    }
-    options.emplace_back("-Ximage:" + image_location, nullptr);
+    options.emplace_back("-Ximage:" + GetImageLocation(), nullptr);
   }
   options.push_back(std::make_pair("-Xcheck:jni", nullptr));
   options.push_back(std::make_pair(min_heap_string, nullptr));