commit eb1e951eabc92336ed9ca38f05ec0eb6d87416d5
author Elliott Hughes <enh@google.com> Wed Nov 01 15:40:20 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 01 15:40:20 2017 +0000
tree b2ee4bb8f16216a33fd4eae2acaf7a2edd6a5f8f
parent 900afe69b3b37fccccda912fccff6859b88de976
parent 3720181581cc402bbaf4fb5be24ccbf9cd2fc19b

Merge "bionic now has ElfXX_Chdr..." am: 0cb208dc6f am: ce252a75e4
am: 3720181581

Change-Id: I75919b372db6f62ea474c51f11bd544c5bc78c5f

config.h

diff --git a/config.h b/config.h
index 858b447..a5caf49 100644
--- a/config.h
+++ b/config.h
@@ -95,10 +95,14 @@
 #endif
 
 /* Define to 1 if the system has the type `Elf32_Chdr'. */
-//#define HAVE_ELF32_CHDR 1
+#ifdef __ANDROID__
+#define HAVE_ELF32_CHDR 1
+#endif
 
 /* Define to 1 if the system has the type `Elf64_Chdr'. */
-//#define HAVE_ELF64_CHDR 1
+#ifdef __ANDROID__
+#define HAVE_ELF64_CHDR 1
+#endif
 
 /* Define to 1 if you have the <endian.h> header file. */
 #define HAVE_ENDIAN_H 1