Fix ART code around JIT zygote.

- The right image location for it now ends with a profile
- Add profile locations to image spaces, so the JIT knows what to
  compile
- Remove now deprecated ApexImage related code.

Bug:119800099
Test: boots, methods from framework gets compiled by zygote
Change-Id: Ie31b62d0a25f1b50e266c1537c43307d7b29e138

1 files changed, 1 insertions, 7 deletions

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index a43390af72..c05ff89beb 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -74,7 +74,6 @@ class CompilerOptions final {
     kBootImage,               // Creating boot image.
     kBootImageExtension,      // Creating boot image extension.
     kAppImage,                // Creating app image.
-    kApexBootImageExtension,  // Creating JIT-zygote boot image extension (b/119800099).
   };
 
   CompilerOptions();
@@ -197,14 +196,9 @@ class CompilerOptions final {
     return image_type_ == ImageType::kBootImage;
   }
 
-  bool IsApexBootImageExtension() const {
-    return image_type_ == ImageType::kApexBootImageExtension;
-  }
-
   // Are we compiling a boot image extension?
   bool IsBootImageExtension() const {
-    return image_type_ == ImageType::kBootImageExtension
-      || image_type_ == ImageType::kApexBootImageExtension;
+    return image_type_ == ImageType::kBootImageExtension;
   }
 
   bool IsBaseline() const {