yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 0fc10739232ac803f7304d01522db6051c7454ff.

Reason: breaks 64bit Android architectures.

BUG=629088
R=primiano@chromium.org

Review URL: https://codereview.chromium.org/2163923002 .
This commit is contained in:
Ross McIlroy 2016-07-20 11:27:11 +01:00
parent c99d374dde
commit b5200a97b7
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/android/include/link.h
View file

@ -30,18 +30,10 @@
#ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H #ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
#define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H #define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
// Android doesn't provide all the data-structures required in /* Android doesn't provide all the data-structures required in its <link.h>.
// its <link.h> before release 21. Provide custom version here and Provide custom version here. */
// rename Bionic-provided structures to avoid conflicts.
#define r_debug __bionic_r_debug
#define link_map __bionic_link_map
#include_next <link.h> #include_next <link.h>
#undef r_debug
#undef link_map
// TODO(rmcilroy): Remove this file once the ndk is updated for other // TODO(rmcilroy): Remove this file once the ndk is updated for other
// architectures - crbug.com/358831 // architectures - crbug.com/358831
#if !defined(__aarch64__) && !defined(__x86_64__) && \ #if !defined(__aarch64__) && !defined(__x86_64__) && \