Revert "Fix oatdump .data.bimg.rel.ro for intrinsics."

This reverts commit 9a8dcea0e97e610c5b8589e0093dbb7766a08694.

Reason for revert: Causing the oatdump_app_test gtest failure over several builds.

Change-Id: I5b985fc701183415529f636cf2e39ed46031ff59

1 files changed, 0 insertions, 16 deletions

diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h
index c4f29677a9..3ead8de905 100644
--- a/oatdump/oatdump_test.h
+++ b/oatdump/oatdump_test.h
@@ -92,7 +92,6 @@ class OatDumpTest : public CommonRuntimeTest {
     kModeOat,
     kModeCoreOat,
     kModeOatWithBootImage,
-    kModeAppImage,
     kModeArt,
     kModeSymbolize,
   };
@@ -109,10 +108,6 @@ class OatDumpTest : public CommonRuntimeTest {
     return "ProfileTestMultiDex";
   }
 
-  std::string GetAppImageName() {
-    return tmp_dir_ + "/" + GetAppBaseName() + ".art";
-  }
-
   std::string GetAppOdexName() {
     return tmp_dir_ + "/" + GetAppBaseName() + ".odex";
   }
@@ -205,17 +200,6 @@ class OatDumpTest : public CommonRuntimeTest {
         exec_argv.push_back("--instruction-set=" + std::string(
             GetInstructionSetString(kRuntimeISA)));
         exec_argv.push_back("--oat-file=" + GetAppOdexName());
-      } else if (mode == kModeAppImage) {
-        exec_argv.push_back("--runtime-arg");
-        exec_argv.push_back(GetClassPathOption("-Xbootclasspath:", GetLibCoreDexFileNames()));
-        exec_argv.push_back("--runtime-arg");
-        exec_argv.push_back(
-            GetClassPathOption("-Xbootclasspath-locations:", GetLibCoreDexLocations()));
-        exec_argv.push_back("--image=" + GetCoreArtLocation());
-        exec_argv.push_back("--instruction-set=" + std::string(
-            GetInstructionSetString(kRuntimeISA)));
-        exec_argv.push_back("--app-oat=" + GetAppOdexName());
-        exec_argv.push_back("--app-image=" + GetAppImageName());
       } else if (mode == kModeCoreOat) {
         exec_argv.push_back("--oat-file=" + core_oat_location_);
       } else {