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

This reverts commit 51754b860868fc5629da6b572e6966448834e293.

Reason for revert: The golem regression is unrelated to this change.

Change-Id: Idf6664101cd09fc6f2edab626a358e64b9d0e5a8

1 files changed, 6 insertions, 4 deletions

diff --git a/libartbase/base/file_utils.h b/libartbase/base/file_utils.h
index f539f5fd55..a8fb0064a9 100644
--- a/libartbase/base/file_utils.h
+++ b/libartbase/base/file_utils.h
@@ -78,11 +78,13 @@ 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.
+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);