diff options
| author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-21 17:55:47 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-21 17:55:47 +0000 |
| commit | 690e294ecea2912709c7d928d40f322cc22da939 (patch) | |
| tree | 27a473cc4f7059561907129b62cad8f40aa5d2b6 /android | |
| parent | Improve Android support (diff) | |
| download | breakpad-690e294ecea2912709c7d928d40f322cc22da939.tar.xz | |
Fix the tools and processor build for Android
This small patch allows the build of the tools and processor
when targetting Android with the Automake/Autconf build.
Not that these necessarily work correctly at the moment,
but there is no need for --disable-tools --disable-processor
now when using --host=arm-linux-androideabi or
--host=i686-linux-android.
+ Modify android/run-checks.sh to build all binaries with
the Automake build.
+ Tiny fix for --abi=x86 in android/run-checks.sh
Review URL: https://breakpad.appspot.com/438002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1018 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'android')
| -rwxr-xr-x | android/run-checks.sh | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/android/run-checks.sh b/android/run-checks.sh index bda99434..deb6f87a 100755 --- a/android/run-checks.sh +++ b/android/run-checks.sh @@ -462,8 +462,15 @@ esac # Extract GNU configuration name case $ARCH in - arm) GNU_CONFIG=arm-linux-androideabi;; - *) GNU_CONFIG="$ARCH-linux-android";; + arm) + GNU_CONFIG=arm-linux-androideabi + ;; + x86) + GNU_CONFIG=i686-linux-android + ;; + *) + GNU_CONFIG="$ARCH-linux-android" + ;; esac # Generate standalone NDK toolchain installation @@ -475,10 +482,10 @@ run "$NDK_DIR/build/tools/make-standalone-toolchain.sh" \ --install-dir="$NDK_STANDALONE" fail_panic "Can't generate standalone NDK toolchain installation!" -# Rebuild the client library with the auto-tools base build system. -# Even though it's not going to be used, this checks that this still -# works correctly. -echo "Building client Android library with configure/make" +# Rebuild the client library, processor and tools with the auto-tools based +# build system. Even though it's not going to be used, this checks that this +# still works correctly. +echo "Building Android binaries with configure/make" TMPTARGET="$TMPDIR/target-local" ( PATH="$NDK_STANDALONE/bin:$PATH" @@ -486,12 +493,10 @@ TMPTARGET="$TMPDIR/target-local" run mkdir "$TMPDIR"/build-target && run cd "$TMPDIR"/build-target && run2 "$PROGDIR"/../configure --prefix="$TMPTARGET" \ - --host="$GNU_CONFIG" \ - --disable-tools \ - --disable-processor && + --host="$GNU_CONFIG" && run2 make -j$NUM_JOBS install ) -fail_panic "Could not rebuild Android client library!" +fail_panic "Could not rebuild Android binaries!" # Copy sources to temporary directory PROJECT_DIR=$TMPDIR/project |