From 5f926055cb88089d8ca27243f35a9dfd89d981f0 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 30 Sep 2016 17:04:49 +0000 Subject: Revert "Store resolved Strings for AOT code in .bss." There are some issues with oat_test64 on host and aosp_mips-eng. Also reverts "compiler_driver: Fix build." Bug: 20323084 Bug: 30627598 This reverts commit 63dccbbefef3014c99c22748d18befcc7bcb3b41. This reverts commit 04a44135ace10123f059373691594ae0f270a8a4. Change-Id: I568ba3e58cf103987fdd63c8a21521010a9f27c4 --- compiler/driver/compiler_driver.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'compiler/driver/compiler_driver.h') diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index eb1222c315..52a04cc46b 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -90,6 +90,8 @@ class CompilerDriver { Compiler::Kind compiler_kind, InstructionSet instruction_set, const InstructionSetFeatures* instruction_set_features, + bool boot_image, + bool app_image, std::unordered_set* image_classes, std::unordered_set* compiled_classes, std::unordered_set* compiled_methods, @@ -145,6 +147,11 @@ class CompilerDriver { return compiler_.get(); } + // Are we compiling and creating an image file? + bool IsBootImage() const { + return boot_image_; + } + const std::unordered_set* GetImageClasses() const { return image_classes_.get(); } @@ -621,6 +628,9 @@ class CompilerDriver { // in the .oat_patches ELF section if requested in the compiler options. size_t non_relative_linker_patch_count_ GUARDED_BY(compiled_methods_lock_); + const bool boot_image_; + const bool app_image_; + // If image_ is true, specifies the classes that will be included in the image. // Note if image_classes_ is null, all classes are included in the image. std::unique_ptr> image_classes_; -- cgit v1.2.3-59-g8ed1b