From 4cbb51a0c057249a500ca7fe3947401978f165d2 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Fri, 7 Feb 2020 11:25:54 +0000 Subject: 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 --- compiler/driver/compiler_options.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'compiler/driver/compiler_options.h') 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 { -- cgit v1.2.3