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 0fc6d0c8df because it
does not compile in Chromium due to the following error:

In file included from ../../breakpad/src/client/linux/minidump_writer/linux_dumper.h:43:0,
                 from ../../breakpad/src/client/linux/minidump_writer/minidump_writer.h:41,
                 from ../../breakpad/src/client/linux/handler/exception_handler.h:42,
                 from ../../components/crash/content/app/breakpad_linux.cc:44:
../../breakpad/src/common/android/include/link.h:46:9: error: multi-line comment [-Werror=comment]
 #endif  // !defined(__aarch64__) && !defined(__x86_64__) && \
         ^

> Don't define |r_debug| and |link_map| on Android releases 21 and later
>
> NDKs for Android 21 and later have the data structures |r_debug| and
> |link_map| defined in their header files. Defining them multiple times
> generates a compiler error.
>
> This patch protects both data structures from definition on Android 21
> and later.
>
> BUG=629088
> R=rmcilroy@chromium.org
>
> Review URL: https://codereview.chromium.org/2156173002 .
>
> Patch from Thomas Zimmermann <tzimmermann@mozilla.com>.
>
> Committed: 0ebdc4a10a

BUG=629088

Change-Id: Ia8d7d0eff060d661113e544d732813820bcb69e0
Reviewed-on: https://chromium-review.googlesource.com/367717
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Sylvain Defresne 2016-08-10 13:39:30 -07:00
parent 600ec35c5b
commit 13c634f6a1
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,30 +30,15 @@
#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
// TODO(rmcilroy): Remove this file once the ndk is updated for other /* Android doesn't provide all the data-structures required in its <link.h>.
// architectures - crbug.com/358831 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.
#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__) && \
!(defined(__mips__) && _MIPS_SIM == _ABI64)
#include_next <link.h> #include_next <link.h>
// TODO(rmcilroy): Remove this file once the ndk is updated for other
// architectures - crbug.com/358831
#if !defined(__aarch64__) && !defined(__x86_64__) && \ #if !defined(__aarch64__) && !defined(__x86_64__) && \
!(defined(__mips__) && _MIPS_SIM == _ABI64) !(defined(__mips__) && _MIPS_SIM == _ABI64)
#undef r_debug
#undef link_map
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif // __cplusplus #endif // __cplusplus
@ -81,7 +66,6 @@ struct link_map {
} // extern "C" } // extern "C"
#endif // __cplusplus #endif // __cplusplus
#endif // !defined(__aarch64__) && !defined(__x86_64__) && \ #endif // !defined(__aarch64__) && !defined(__x86_64__)
!(defined(__mips__) && _MIPS_SIM == _ABI64)
#endif /* GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H */ #endif /* GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H */