diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-30 09:47:55 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-30 20:32:36 +0000 |
| commit | c5e3a52473772a6aba3a8407b0151f6046c5e21b (patch) | |
| tree | 3f28b8774ebe74eabe73407c52edb5dcec697a97 /compiler/driver/compiler_options.h | |
| parent | 498019ab91ea40352ea1e54a8425e1689dc1317d (diff) | |
Make compiling an apex image explicit.
And when compiling an apex image, discard dex files not present
in an apex.
Test: m
Bug: 119800099
Change-Id: Ie91c5b8d271783f04e4c1501f315a3ec59137475
Diffstat (limited to 'compiler/driver/compiler_options.h')
| -rw-r--r-- | compiler/driver/compiler_options.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h index 5908b87d3c..0ab5ff1907 100644 --- a/compiler/driver/compiler_options.h +++ b/compiler/driver/compiler_options.h @@ -75,6 +75,7 @@ class CompilerOptions final { kNone, // JIT or AOT app compilation producing only an oat file but no image. kBootImage, // Creating boot image. kAppImage, // Creating app image. + kApexBootImage, // Creating the apex image for jit/zygote experiment b/119800099. }; CompilerOptions(); @@ -210,7 +211,11 @@ class CompilerOptions final { // Are we compiling a boot image? bool IsBootImage() const { - return image_type_ == ImageType::kBootImage; + return image_type_ == ImageType::kBootImage || image_type_ == ImageType::kApexBootImage; + } + + bool IsApexBootImage() const { + return image_type_ == ImageType::kApexBootImage; } bool IsBaseline() const { |