3 files changed, 6 insertions, 58 deletions
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 <link.h>. Provide custom version here */
-#include <elf.h>
+/* Android doesn't provide all the data-structures required in its <link.h>.
+   Provide custom version here. */
+#include_next <link.h>
 
 #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 <asm/sgidefs.h> which
+// contains what we need.
+#include <asm/sgidefs.h>
 
 #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 <sys/stat.h>
-
-#ifndef S_IRWXU
-#define S_IRWXU  00700
-#endif
-
-#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_STAT_H