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
diff --git a/compiler/driver/compiler_options.h b/compiler/driver/compiler_options.h
index 8e4a775..abc58d7 100644
--- a/compiler/driver/compiler_options.h
+++ b/compiler/driver/compiler_options.h
@@ -203,14 +203,6 @@
return include_patch_information_;
}
- bool IsBootImage() const {
- return boot_image_;
- }
-
- bool IsAppImage() const {
- return app_image_;
- }
-
// Should the code be compiled as position independent?
bool GetCompilePic() const {
return compile_pic_;
@@ -289,8 +281,6 @@
// prefer vector<> over a lookup-oriented container, such as set<>.
const std::vector<const DexFile*>* no_inline_from_;
- bool boot_image_;
- bool app_image_;
bool include_patch_information_;
// When using a profile file only the top K% of the profiled samples will be compiled.
double top_k_profile_threshold_;
@@ -315,7 +305,7 @@
std::string dump_cfg_file_name_;
bool dump_cfg_append_;
- // Whether the compiler should trade performance for determinism to guarantee exactly reproducible
+ // Whether the compiler should trade performance for determinism to guarantee exactly reproducable
// outcomes.
bool force_determinism_;
@@ -330,7 +320,6 @@
const std::vector<std::string>* passes_to_run_;
friend class Dex2Oat;
- friend class CommonCompilerTest;
DISALLOW_COPY_AND_ASSIGN(CompilerOptions);
};