aboutsummaryrefslogtreecommitdiff
path: root/src/common/android
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-09-25 13:47:44 +0000
committerdigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-09-25 13:47:44 +0000
commit5bce3b4d7728c7b7b03d6407575051e069355a8f (patch)
treeacbfbd053217a65d427dff36aa832e63d7b9682a /src/common/android
parentAdding mips support for Android. (diff)
downloadbreakpad-5bce3b4d7728c7b7b03d6407575051e069355a8f.tar.xz
Fix the Android/MIPS build.
This patch fixes the build for Android on MIPS when using the latest official Android NDK (r9): - Update src/common/android/include/elf.h to add a missing definition for SHT_MIPS_DWARF. - Add src/common/android/include/sgidefs.h required by LSS when compiling for MIPS. - Update android/run-checks.sh to work properly with the --abi=mips option. All tests were passed succesfully with an emulator system image running Android 4.2. - Update other Android-specific files. R=Petar.Jovanovic@imgtec.com, mark@chromium.org Review URL: https://breakpad.appspot.com/633002 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1216 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/common/android')
-rw-r--r--src/common/android/include/elf.h4
-rw-r--r--src/common/android/include/sgidefs.h51
2 files changed, 55 insertions, 0 deletions
diff --git a/src/common/android/include/elf.h b/src/common/android/include/elf.h
index debe30be..af50a799 100644
--- a/src/common/android/include/elf.h
+++ b/src/common/android/include/elf.h
@@ -152,6 +152,10 @@ typedef struct {
#define NT_FPREGSET 2
#endif
+#if !defined(SHT_MIPS_DWARF)
+#define SHT_MIPS_DWARF 0x7000001e
+#endif
+
#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
diff --git a/src/common/android/include/sgidefs.h b/src/common/android/include/sgidefs.h
new file mode 100644
index 00000000..cc8ef5d0
--- /dev/null
+++ b/src/common/android/include/sgidefs.h
@@ -0,0 +1,51 @@
+// Copyright (c) 2013, 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_ANDROID_INCLUDE_SGIDEFS_H
+#define GOOGLE_BREAKPAD_ANDROID_INCLUDE_SGIDEFS_H
+
+#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
+
+#endif // __mips__
+
+#endif // GOOGLE_BREAKPAD_ANDROID_INCLUDE_SGIDEFS_H