Revert "Don't define |r_debug| and |link_map| on Android releases 21 and later"
This reverts commit 0fc10739232ac803f7304d01522db6051c7454ff.
Reason: breaks 64bit Android architectures.
BUG=629088
R=primiano@chromium.org
Review URL: https://codereview.chromium.org/2163923002 .
diff --git a/src/common/android/include/link.h b/src/common/android/include/link.h
index 58180a8..e7ff8e2 100644
--- a/src/common/android/include/link.h
+++ b/src/common/android/include/link.h
@@ -30,18 +30,10 @@
#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> 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
-
+/* Android doesn't provide all the data-structures required in its <link.h>.
+ Provide custom version here. */
#include_next <link.h>
-#undef r_debug
-#undef link_map
-
// TODO(rmcilroy): Remove this file once the ndk is updated for other
// architectures - crbug.com/358831
#if !defined(__aarch64__) && !defined(__x86_64__) && \
