From 46aba5a43a13c9f5c0e69fe624482fd8376ea72c Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Wed, 2 Apr 2014 23:02:31 +0000 Subject: Remove some unecessary Android system header definitions. Newer NDKs include some additional headers needed by Breakpad, so we can remove these redefinitions. BUG=358831,335641,354405 R=mark@chromium.org Review URL: https://breakpad.appspot.com/1374002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1300 4c0a9323-5329-0410-9bdc-e9ce6186880e --- src/common/android/include/link.h | 9 +++----- src/common/android/include/sgidefs.h | 16 +++----------- src/common/android/include/sys/stat.h | 39 ----------------------------------- 3 files changed, 6 insertions(+), 58 deletions(-) delete mode 100644 src/common/android/include/sys/stat.h (limited to 'src/common/android') diff --git a/src/common/android/include/link.h b/src/common/android/include/link.h index 6f3c1828..6c4e9411 100644 --- a/src/common/android/include/link.h +++ b/src/common/android/include/link.h @@ -30,17 +30,14 @@ #ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H #define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H -/* Android doesn't provide . Provide custom version here */ -#include +/* Android doesn't provide all the data-structures required in its . + Provide custom version here. */ +#include_next #ifdef __cplusplus extern "C" { #endif // __cplusplus -#define ElfW(type) _ElfW (Elf, ELFSIZE, type) -#define _ElfW(e,w,t) _ElfW_1 (e, w, _##t) -#define _ElfW_1(e,w,t) e##w##t - struct r_debug { int r_version; struct link_map* r_map; diff --git a/src/common/android/include/sgidefs.h b/src/common/android/include/sgidefs.h index cc8ef5d0..33796dcf 100644 --- a/src/common/android/include/sgidefs.h +++ b/src/common/android/include/sgidefs.h @@ -32,19 +32,9 @@ #ifdef __mips__ -#define _MIPS_SIM_ABI32 1 -#define _MIPS_SIM_NABI32 2 -#define _MIPS_SIM_ABI64 3 - -// The following should always be defined by the compiler, -// Verified for Android with GCC 4.6 and Clang 3.1. -#ifndef _MIPS_SIM -#error "Toolchain should define _MIPS_SIM" -#endif - -#ifndef _MIPS_SZPTR -#error "Toolchain should define _MIPS_PTR" -#endif +// Android doesn't contain sgidefs.h, but does have which +// contains what we need. +#include #endif // __mips__ diff --git a/src/common/android/include/sys/stat.h b/src/common/android/include/sys/stat.h deleted file mode 100644 index 93ebd080..00000000 --- a/src/common/android/include/sys/stat.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2012, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_STAT_H -#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_STAT_H - -#include_next - -#ifndef S_IRWXU -#define S_IRWXU 00700 -#endif - -#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_STAT_H -- cgit v1.2.1