Disable runtime app image while investigating b/268225365.

Test: m
Bug: 268225365
Bug: 260557058
Change-Id: I60623a7f49a357c8b689f2282d0408bc89094896

1 files changed, 4 insertions, 1 deletions

diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index b0bcd2f878..eb2f89cf2d 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -66,6 +66,9 @@ using android::base::StringPrintf;
 // If true, we attempt to load the application image if it exists.
 static constexpr bool kEnableAppImage = true;
 
+// If true, we attempt to load an app image generated by the runtime.
+static constexpr bool kEnableRuntimeAppImage = false;
+
 const OatFile* OatFileManager::RegisterOatFile(std::unique_ptr<const OatFile> oat_file,
                                                bool in_memory) {
   // Use class_linker vlog to match the log for dex file registration.
@@ -268,7 +271,7 @@ std::vector<std::unique_ptr<const DexFile>> OatFileManager::OpenDexFilesFromOat(
           // is executable.
           image_space = oat_file_assistant->OpenImageSpace(oat_file.get());
         }
-        if (image_space == nullptr && !compilation_enabled) {
+        if (kEnableRuntimeAppImage && image_space == nullptr && !compilation_enabled) {
           std::string art_file = RuntimeImage::GetRuntimeImagePath(dex_location);
           std::string error_msg;
           ScopedObjectAccess soa(self);