Index: src/common/android/include/link.h |
diff --git a/src/common/android/include/link.h b/src/common/android/include/link.h |
index e7ff8e2d8702b0037921b50c99b94f02758f6e2a..58180a8ec365ba65cfd58406ab63942bc2090aaf 100644 |
--- a/src/common/android/include/link.h |
+++ b/src/common/android/include/link.h |
@@ -30,10 +30,18 @@ |
#ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H |
#define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H |
-/* Android doesn't provide all the data-structures required in its <link.h>. |
- Provide custom version here. */ |
+// Android doesn't provide all the data-structures required in |
+// its <link.h> before release 21. Provide custom version here and |
+// rename Bionic-provided structures to avoid conflicts. |
+ |
+#define r_debug __bionic_r_debug |
+#define link_map __bionic_link_map |
+ |
#include_next <link.h> |
+#undef r_debug |
+#undef link_map |
+ |
hush (inactive)
2016/07/19 18:52:36
the block after line 48 won't be applied to 64 bit
|
// TODO(rmcilroy): Remove this file once the ndk is updated for other |
// architectures - crbug.com/358831 |
#if !defined(__aarch64__) && !defined(__x86_64__) && \ |