Don't define |r_debug| and |link_map| on Android releases 21 and later

src/common/android/include/link.h

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..64f21b1246d7f25797761f0e37bf29e4f6e69496 100644
--- a/src/common/android/include/link.h
+++ b/src/common/android/include/link.h
@@ -30,15 +30,29 @@
 #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. */
-#include_next <link.h>
-
 // TODO(rmcilroy): Remove this file once the ndk is updated for other
 // architectures - crbug.com/358831
+
+// 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.
+
 #if !defined(__aarch64__) && !defined(__x86_64__) && \
     !(defined(__mips__) && _MIPS_SIM == _ABI64)
 
+#define r_debug   __bionic_r_debug
+#define link_map  __bionic_link_map
+
+#endif  // !defined(__aarch64__) && !defined(__x86_64__)

[rmcilroy, 2016/07/28 15:07:51]

Please update comment with Mips (and below)

+
+#include_next <link.h>
+
+#if !defined(__aarch64__) && !defined(__x86_64__) && \
+    !(defined(__mips__) && _MIPS_SIM == _ABI64)
+
+#undef r_debug
+#undef link_map
+
 #ifdef __cplusplus
 extern "C" {
 #endif  // __cplusplus