Add GDB JIT support back into Android build.

runtime/vm/elfgen.h

Index: runtime/vm/elfgen.h
diff --git a/runtime/vm/debuginfo_linux.cc b/runtime/vm/elfgen.h
similarity index 91%
copy from runtime/vm/debuginfo_linux.cc
copy to runtime/vm/elfgen.h
index 35a7824e2e039444a701cc936cbe954d42bad526..4e330d5fcc07f9720f71de401741de1c054c118e 100644
--- a/runtime/vm/debuginfo_linux.cc
+++ b/runtime/vm/elfgen.h
@@ -2,11 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-#include "vm/debuginfo.h"
 
-#include "platform/utils.h"
-#include "vm/gdbjit_linux.h"
-#include "vm/os.h"
+#ifndef VM_ELFGEN_H_
+#define VM_ELFGEN_H_
+
 #include "vm/thread.h"
 
 namespace dart {
@@ -496,64 +495,6 @@ bool ElfGen::WriteOutput(void* handle,
 }
 
 

[cshapiro, 2012/08/15 01:45:07]

Remove line 497

-DebugInfo::DebugInfo() {
-  handle_ = reinterpret_cast<void*>(new ElfGen());
-  ASSERT(handle_ != NULL);
-}
-
-
-DebugInfo::~DebugInfo() {
-  ElfGen* elf_gen = reinterpret_cast<ElfGen*>(handle_);
-  delete elf_gen;
-}
-
-
-void DebugInfo::AddCode(uword pc, intptr_t size) {
-  ElfGen* elf_gen = reinterpret_cast<ElfGen*>(handle_);
-  elf_gen->AddCode(pc, size);
-}
-
-
-void DebugInfo::AddCodeRegion(const char* name, uword pc, intptr_t size) {
-  ElfGen* elf_gen = reinterpret_cast<ElfGen*>(handle_);
-  elf_gen->AddCodeRegion(name, pc, size);
-}
-
-
-bool DebugInfo::WriteToMemory(ByteBuffer* region) {
-  ElfGen* elf_gen = reinterpret_cast<ElfGen*>(handle_);
-  return elf_gen->WriteToMemory(region);
-}
-
-
-DebugInfo* DebugInfo::NewGenerator() {
-  return new DebugInfo();
-}
-
-
-void DebugInfo::RegisterSection(const char* name,
-                                uword entry_point,
-                                intptr_t size) {
-  ElfGen* elf_section = new ElfGen();
-  ASSERT(elf_section != NULL);
-  elf_section->AddCode(entry_point, size);
-  elf_section->AddCodeRegion(name, entry_point, size);
-
-  ByteBuffer* dynamic_region = new ByteBuffer();
-  ASSERT(dynamic_region != NULL);
-
-  elf_section->WriteToMemory(dynamic_region);
-
-  ::addDynamicSection(reinterpret_cast<const char*>(dynamic_region->data()),
-                      dynamic_region->size());
-  dynamic_region->set_data(NULL);
-  delete dynamic_region;
-  delete elf_section;
-}
-
-
-void DebugInfo::UnregisterAllSections() {
-  ::deleteDynamicSections();
-}
-
 }  // namespace dart
+
+#endif  // VM_ELFGEN_H_