diff options
Diffstat (limited to 'compiler/driver/compiler_options.h')
| -rw-r--r-- | compiler/driver/compiler_options.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index e24da593a7..a43390af72 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -70,11 +70,11 @@ class CompilerOptions final { static constexpr size_t kUnsetInlineMaxCodeUnits = -1; enum class ImageType : uint8_t { - kNone, // JIT or AOT app compilation producing only an oat file but no image. - kBootImage, // Creating boot image. - kBootImageExtension, // Creating boot image extension. - kAppImage, // Creating app image. - kApexBootImage, // Creating the apex image for jit/zygote experiment b/119800099. + kNone, // JIT or AOT app compilation producing only an oat file but no image. + kBootImage, // Creating boot image. + kBootImageExtension, // Creating boot image extension. + kAppImage, // Creating app image. + kApexBootImageExtension, // Creating JIT-zygote boot image extension (b/119800099). }; CompilerOptions(); @@ -194,16 +194,17 @@ class CompilerOptions final { // Are we compiling a boot image? bool IsBootImage() const { - return image_type_ == ImageType::kBootImage || image_type_ == ImageType::kApexBootImage; + return image_type_ == ImageType::kBootImage; } - bool IsApexBootImage() const { - return image_type_ == ImageType::kApexBootImage; + bool IsApexBootImageExtension() const { + return image_type_ == ImageType::kApexBootImageExtension; } // Are we compiling a boot image extension? bool IsBootImageExtension() const { - return image_type_ == ImageType::kBootImageExtension; + return image_type_ == ImageType::kBootImageExtension + || image_type_ == ImageType::kApexBootImageExtension; } bool IsBaseline() const { |