commit 4b018565e57c3349a3c1b5ec8ac9dae261c5e00b
author Nicolas Geoffray <ngeoffray@google.com> Thu Nov 05 08:47:52 2015 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Nov 05 08:48:36 2015 +0000
tree ee1ea3271d41b9a647a7ce7e4d1a0ed94eff9fcf
parent c033474cfbfe1e963c07fa5c38aed02e35ed6f91

Revert "Add basic image writer support for app images"

interpreter and jit tests fail.

Bug: 22858531

This reverts commit c033474cfbfe1e963c07fa5c38aed02e35ed6f91.

Change-Id: Ic12a3e2a1908ac0db52d21a0b44b2508c88b2585

compiler/image_test.cc

diff --git a/compiler/image_test.cc b/compiler/image_test.cc
index a38e1f5..fd6cd82 100644
--- a/compiler/image_test.cc
+++ b/compiler/image_test.cc
@@ -64,10 +64,8 @@
   ScratchFile oat_file(OS::CreateEmptyFile(oat_filename.c_str()));
 
   const uintptr_t requested_image_base = ART_BASE_ADDRESS;
-  std::unique_ptr<ImageWriter> writer(new ImageWriter(*compiler_driver_,
-                                                      requested_image_base,
-                                                      /*compile_pic*/false,
-                                                      /*compile_app_image*/false));
+  std::unique_ptr<ImageWriter> writer(new ImageWriter(*compiler_driver_, requested_image_base,
+                                                      /*compile_pic*/false));
   // TODO: compile_pic should be a test argument.
   {
     {
@@ -83,15 +81,8 @@
 
       t.NewTiming("WriteElf");
       SafeMap<std::string, std::string> key_value_store;
-      OatWriter oat_writer(class_linker->GetBootClassPath(),
-                           0,
-                           0,
-                           0,
-                           compiler_driver_.get(),
-                           writer.get(),
-                           /*compiling_boot_image*/true,
-                           &timings,
-                           &key_value_store);
+      OatWriter oat_writer(class_linker->GetBootClassPath(), 0, 0, 0, compiler_driver_.get(),
+                           writer.get(), &timings, &key_value_store);
       bool success = writer->PrepareImageAddressSpace() &&
           compiler_driver_->WriteElf(GetTestAndroidRoot(),
                                      !kIsTargetBuild,