diff options
| author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-09-25 13:47:44 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2013-09-25 13:47:44 +0000 |
| commit | 5bce3b4d7728c7b7b03d6407575051e069355a8f (patch) | |
| tree | acbfbd053217a65d427dff36aa832e63d7b9682a /android | |
| parent | Adding mips support for Android. (diff) | |
| download | breakpad-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 'android')
| -rw-r--r-- | android/google_breakpad/Android.mk | 8 | ||||
| -rwxr-xr-x | android/run-checks.sh | 3 | ||||
| -rw-r--r-- | android/sample_app/jni/Application.mk | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/android/google_breakpad/Android.mk b/android/google_breakpad/Android.mk index 7bd44003..52fa5e4b 100644 --- a/android/google_breakpad/Android.mk +++ b/android/google_breakpad/Android.mk @@ -45,11 +45,6 @@ # to select one in your Application.mk # -# Sanity check. We can only build for ARM for now. -ifneq (,$(filter-out armeabi armeabi-v7a x86,$(TARGET_ARCH_ABI))) -$(error Sorry, Google Breakpad only works on Android ARM and x86 for now!) -endif - # The top Google Breakpad directory. # We assume this Android.mk to be under 'android/google_breakpad' @@ -85,7 +80,8 @@ LOCAL_SRC_FILES := \ src/client/minidump_file_writer.cc \ src/common/android/breakpad_getcontext.S \ src/common/convert_UTF.c \ - src/common/md5.cc src/common/string_conversion.cc \ + src/common/md5.cc \ + src/common/string_conversion.cc \ src/common/linux/elfutils.cc \ src/common/linux/file_id.cc \ src/common/linux/guid_creator.cc \ diff --git a/android/run-checks.sh b/android/run-checks.sh index 400f7561..51d2d502 100755 --- a/android/run-checks.sh +++ b/android/run-checks.sh @@ -326,6 +326,9 @@ case $ARCH in x86) GNU_CONFIG=i686-linux-android ;; + mips) + GNU_CONFIG=mipsel-linux-android + ;; *) GNU_CONFIG="$ARCH-linux-android" ;; diff --git a/android/sample_app/jni/Application.mk b/android/sample_app/jni/Application.mk index 50dcd0d5..366ce29f 100644 --- a/android/sample_app/jni/Application.mk +++ b/android/sample_app/jni/Application.mk @@ -28,4 +28,4 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. APP_STL := stlport_static -APP_ABI := armeabi armeabi-v7a +APP_ABI := all |