commit e5fc334cbe894cb8ff575cf4ab72e20e486c303e
author Shih-wei Liao <sliao@google.com> Sun Jun 03 11:41:12 2012 -0700
committer Shih-wei Liao <sliao@google.com> Sun Jun 03 11:48:34 2012 -0700
tree ddb129074dba56828ba9fcf4dc78c215c9df152a
parent 60d25e456f195ff26e0464ce31f701426b7f24e1

Fix the build. Apologies for mistake.

Change-Id: If00f9d1ec24d038bd0ff5ee2b90e0e2cb805ca3b

src/oat_writer.cc

diff --git a/src/oat_writer.cc b/src/oat_writer.cc
index f5c0816..d905090 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -366,18 +366,13 @@
   const CompiledInvokeStub* compiled_invoke_stub = compiler_->FindInvokeStub(is_static, shorty);
   if (compiled_invoke_stub != NULL) {
     if (compiled_invoke_stub->IsExecutableInElf()) {
-<<<<<<< HEAD
 #if defined(ART_USE_LLVM_COMPILER)
-      invoke_stub_elf_idx = compiled_invoke_stub->GetElfIndex();
-      invoke_stub_elf_func_idx = compiled_invoke_stub->GetElfFuncIndex();
-#endif
-=======
       invoke_stub_elf_idx = compiled_invoke_stub->GetStubElfIndex();
       invoke_stub_elf_func_idx = compiled_invoke_stub->GetInvokeStubElfFuncIndex();
       if (!is_static) {
         proxy_stub_elf_func_idx = compiled_invoke_stub->GetProxyStubElfFuncIndex();
       }
->>>>>>> f3b0b35... Implement proxy stub for compiler_llvm.
+#endif
     } else {
       offset = CompiledMethod::AlignCode(offset, compiler_->GetInstructionSet());
       DCHECK_ALIGNED(offset, kArmAlignment);