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

This reverts commit c66398d182443208e73133705da1a25a3794fc8e.

Reason for revert: Maybe(?) caused regressions on Golem.

Bug: 270958761
Change-Id: If9f27d2cbe2d22a1f4bd1e0efab8f85d0e1f1a78

1 files changed, 4 insertions, 6 deletions

diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h
index a8fb0064a9..f539f5fd55 100644
--- a/libartbase/base/file_utils.h
+++ b/libartbase/base/file_utils.h
@@ -78,13 +78,11 @@ std::string GetArtApexData();
 // generated at build time).
 std::string GetPrebuiltPrimaryBootImageDir();
 
-// Returns the default boot image location, based on the passed `android_root`.
-// Returns an empty string if an error occurs.
-std::string GetDefaultBootImageLocationSafe(const std::string& android_root,
-                                            bool deny_art_apex_data_files,
-                                            std::string* error_msg);
+// 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);
 
-// Same as above, but fails if an error occurs.
+// Returns the default boot image location, based on the passed `android_root`.
 std::string GetDefaultBootImageLocation(const std::string& android_root,
                                         bool deny_art_apex_data_files);