From 10c13565474de2786aad7c2e79757ea250747a15 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Wed, 25 Nov 2015 14:33:36 +0000 Subject: Refactor oat file writing to give Dex2Oat more control. This is the first step towards writing dex files to oat file and mapping them from there for the actual AOT compilation. Change-Id: Icb0d27487eaf6ba3a66c157e695f9bdc5bb9cf9a --- compiler/driver/compiler_driver.cc | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'compiler/driver/compiler_driver.cc') diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index d67087edd9..9d3af1681a 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -45,7 +45,6 @@ #include "dex/quick/dex_file_method_inliner.h" #include "dex/quick/dex_file_to_method_inliner_map.h" #include "driver/compiler_options.h" -#include "elf_writer_quick.h" #include "jni_internal.h" #include "object_lock.h" #include "profiler.h" @@ -77,9 +76,6 @@ namespace art { static constexpr bool kTimeCompileMethod = !kIsDebugBuild; -// Whether to produce 64-bit ELF files for 64-bit targets. -static constexpr bool kProduce64BitELFFiles = true; - // Whether classes-to-compile and methods-to-compile are only applied to the boot image, or, when // given, too all compilations. static constexpr bool kRestrictCompilationFiltersToImage = true; @@ -2514,19 +2510,6 @@ bool CompilerDriver::RequiresConstructorBarrier(Thread* self, const DexFile* dex return freezing_constructor_classes_.count(ClassReference(dex_file, class_def_index)) != 0; } -bool CompilerDriver::WriteElf(const std::string& android_root, - bool is_host, - const std::vector& dex_files, - OatWriter* oat_writer, - art::File* file) - SHARED_REQUIRES(Locks::mutator_lock_) { - if (kProduce64BitELFFiles && Is64BitInstructionSet(GetInstructionSet())) { - return art::ElfWriterQuick64::Create(file, oat_writer, dex_files, android_root, is_host, *this); - } else { - return art::ElfWriterQuick32::Create(file, oat_writer, dex_files, android_root, is_host, *this); - } -} - bool CompilerDriver::SkipCompilation(const std::string& method_name) { if (!profile_present_) { return false; -- cgit v1.2.3-59-g8ed1b