commit 6cf7a9b0ecce7057758a55d8a2a2a5f1ca4653dc
author Nicolas Geoffray <ngeoffray@google.com> Thu Feb 27 21:51:29 2020 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Feb 28 08:36:58 2020 +0000
tree e460c6d1a599ba65e540951f5687227779e81a87
parent e248b023113308862520ba8d42f882c6a1016dbd

Revert "Revert "If generating an image, run initialization and other optimizations.""

This reverts commit bbec8a6fc720ee5ce572d3fb63617fb0af6addc7.

Reason for revert: Fix vdex compilation with app images.

Test: 628-vdex
Bug: 150193586

Change-Id: Ic4d0445f277caf9405c18938c1f39ee08b9bf2fd

compiler/driver/compiler_options.h

diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 747205e..79ba1c2 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -195,6 +195,10 @@
     return implicit_suspend_checks_;
   }
 
+  bool IsGeneratingImage() const {
+    return IsBootImage() || IsBootImageExtension() || IsAppImage();
+  }
+
   // Are we compiling a boot image?
   bool IsBootImage() const {
     return image_type_ == ImageType::kBootImage;