From e35167de7516448fcc2bf687ad580b9d8b6aedc2 Mon Sep 17 00:00:00 2001 From: Yunlian Jiang Date: Wed, 18 May 2016 15:06:38 -0700 Subject: use another elf.h inside the package for common/dwarf/elf_reader We tried to use common/android/include/elf.h, however it contains '#include-next elf.h' so it still breaks MAC build. So we use third_party/musl/include/elf.h instead. BUG=none TEST=make; make test passes. There is no '#include-next elf.h' in the new elf.h R=michaelbai@chromium.org Review URL: https://codereview.chromium.org/1994633003 . --- src/common/dwarf/elf_reader.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/dwarf/elf_reader.cc b/src/common/dwarf/elf_reader.cc index a1f73cd1..79ebbdfd 100644 --- a/src/common/dwarf/elf_reader.cc +++ b/src/common/dwarf/elf_reader.cc @@ -43,7 +43,7 @@ #include #include "zlib.h" -#include "common/android/include/elf.h" +#include "third_party/musl/include/elf.h" #include "elf_reader.h" //#include "using_std_string.h" // EM_AARCH64 is not defined by elf.h of GRTE v3 on x86. -- cgit v1.2.1