commit d9de8391b94a7446c6505920fa52eb58f19d7968
author Vladimir Marko <vmarko@google.com> Thu Jan 23 12:45:05 2014 +0000
committer Vladimir Marko <vmarko@google.com> Thu Jan 23 16:53:21 2014 +0000
tree f91d737cbcc1f409008069579b763e9ea05fa586
parent 9d8918fe97c235fdc6eb2c7f2d50a6673ab50329

Fix header file references to the ::llvm::ELF namespace.

We have header files which define the namespace ::art::llvm
and if they are included before the header files fixed here,
references to llvm::ELF from ::art pick up ::art::llvm
instead of ::llvm and fail to find ELF, causing an error.
Therefore we add the leading "::".

Change-Id: Ib02c9317d39cde5331dd67463013643cbc79ee1f

compiler/elf_writer_mclinker.h

diff --git a/compiler/elf_writer_mclinker.h b/compiler/elf_writer_mclinker.h
index 5da178c..a0cd7f0 100644
--- a/compiler/elf_writer_mclinker.h
+++ b/compiler/elf_writer_mclinker.h
@@ -68,7 +68,7 @@
   void FixupOatMethodOffsets(const std::vector<const DexFile*>& dex_files)
       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
   uint32_t FixupCompiledCodeOffset(ElfFile& elf_file,
-                                   llvm::ELF::Elf32_Addr oatdata_address,
+                                   ::llvm::ELF::Elf32_Addr oatdata_address,
                                    const CompiledCode& compiled_code);
 #endif