commit f9b87b1eece0e03578c4d1b627f1d5e8691a539a
author Nicolas Geoffray <ngeoffray@google.com> Tue Sep 02 08:12:09 2014 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Sep 02 08:12:09 2014 +0000
tree 451b94c30f4b9a25e40600d6993fc1069efa0689
parent 7eebd95bddc7c6866ba29010d28b4f8251b43242

Revert "Revert "ART: Prepare for ELF64.""

Fix was commited in "Fix frame size issue with 64-bit"

This reverts commit 7eebd95bddc7c6866ba29010d28b4f8251b43242.

Change-Id: I799b7fcab14ae24471d2f9d6d3a5e5cedd4aa7b8

compiler/dex/quick/quick_compiler.cc

diff --git a/compiler/dex/quick/quick_compiler.cc b/compiler/dex/quick/quick_compiler.cc
index 49c16cb..2c5f79c 100644
--- a/compiler/dex/quick/quick_compiler.cc
+++ b/compiler/dex/quick/quick_compiler.cc
@@ -608,8 +608,8 @@
                              const std::vector<const art::DexFile*>& dex_files,
                              const std::string& android_root,
                              bool is_host) const {
-  return art::ElfWriterQuick::Create(file, oat_writer, dex_files, android_root, is_host,
-                                     *GetCompilerDriver());
+  return art::ElfWriterQuick32::Create(file, oat_writer, dex_files, android_root, is_host,
+                                       *GetCompilerDriver());
 }
 
 Backend* QuickCompiler::GetCodeGenerator(CompilationUnit* cu, void* compilation_unit) const {