Revert^3 "Add the mainline framework boot image extension to the default."

This reverts commit 43f9a4abb838afba01815532832c5c1a606771dc.

Reason for revert: Caused various SH regressions.

Bug: 271036161
Change-Id: I6e7e3f0f64abbde22d226aadbbf12efb2dd9e7d7

1 files changed, 4 insertions, 8 deletions

diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h
index 408163fd7d..f539f5fd55 100644
--- a/libartbase/base/file_utils.h
+++ b/libartbase/base/file_utils.h
@@ -78,15 +78,11 @@ std::string GetArtApexData();
 // generated at build time).
 std::string GetPrebuiltPrimaryBootImageDir();
 
+// Returns the default boot image location (ANDROID_ROOT/framework/boot.art).
+// Returns an empty string if ANDROID_ROOT is not set.
+std::string GetDefaultBootImageLocation(std::string* error_msg);
+
 // Returns the default boot image location, based on the passed `android_root`.
-// Returns an empty string if an error occurs.
-// The default boot image location can only be used with the default bootclasspath (the value of the
-// BOOTCLASSPATH environment variable).
-std::string GetDefaultBootImageLocationSafe(const std::string& android_root,
-                                            bool deny_art_apex_data_files,
-                                            std::string* error_msg);
-
-// Same as above, but fails if an error occurs.
 std::string GetDefaultBootImageLocation(const std::string& android_root,
                                         bool deny_art_apex_data_files);