aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunlian Jiang <yunlian@google.com>2016-05-18 15:06:38 -0700
committerYunlian Jiang <yunlian@google.com>2016-05-18 15:06:38 -0700
commite35167de7516448fcc2bf687ad580b9d8b6aedc2 (patch)
tree5a9f7af3a45ee891802b0eead34ab26e7d1765bc
parentUse elf.h inside the package. (diff)
downloadbreakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.xz
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 .
-rw-r--r--src/common/dwarf/elf_reader.cc2
1 files changed, 1 insertions, 1 deletions
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 <vector>
#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.