diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-02 15:14:24 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-02 15:14:24 +0000 |
| commit | db5460bb79d7a67185387ea43b5427eb1036d9ca (patch) | |
| tree | 36ca1d323568e43aab5d8863564eacc516809439 /platform_tools | |
| parent | aade2e1e19181eee0d950456cf50aa7cf6a239f8 (diff) | |
add remote debugging support for x86 phone
R=djsollen@google.com, borenet@google.com
Author: yunchao.he@intel.com
Review URL: https://chromiumcodereview.appspot.com/19920003
git-svn-id: http://skia.googlecode.com/svn/trunk@10511 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/android_gdb | 24 | ||||
| -rwxr-xr-x | platform_tools/android/bin/android_gdb_exe | 33 |
2 files changed, 51 insertions, 6 deletions
diff --git a/platform_tools/android/bin/android_gdb b/platform_tools/android/bin/android_gdb index 58e0b177bd..361a0bd338 100755 --- a/platform_tools/android/bin/android_gdb +++ b/platform_tools/android/bin/android_gdb @@ -9,11 +9,26 @@ PORT=5039 # Collect extra arguments to be passed to the Skia binary shift +deviceID="" while (( "$#" )); do - APP_ARGS="$APP_ARGS $1" + + if [[ $(echo "$1" | grep "^-d$") != "" ]]; + then + deviceID=$2 + shift + else + APP_ARGS="$APP_ARGS $1" + fi + shift done +# hack for x86 support in android_setup.sh +if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ] +then + ANDROID_ARCH=x86 +fi + source $SCRIPT_DIR/android_setup.sh source $SCRIPT_DIR/utils/setup_adb.sh @@ -56,7 +71,12 @@ echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP # Launch gdb client echo "Entering gdb client shell" -$ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP +if [ "$ANDROID_ARCH" == "x86" ] +then + $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP +else + $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP +fi # Clean up rm -rf $GDB_TMP_DIR diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdb_exe index 4a3ea99140..190f223e56 100755 --- a/platform_tools/android/bin/android_gdb_exe +++ b/platform_tools/android/bin/android_gdb_exe @@ -2,10 +2,30 @@ # # android_gdb: Pushes gdbserver. Connects and enters debugging environment. +deviceID="" +while (( "$#" )); do + + if [[ $(echo "$1" | grep "^-d$") != "" ]]; + then + deviceID="$2" + shift + else + gdbVars=("${gdbVars[@]}" "$1") + fi + + shift +done + +# hack for x86 support in android_setup.sh +if [ "$deviceID" == "x86" ] || [ "$deviceID" == "razr_i" ] +then + export ANDROID_ARCH=x86 +fi + SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # setup the gdbserver -$SCRIPT_DIR/android_gdbserver $@ +$SCRIPT_DIR/android_gdbserver ${gdbVars[@]} # quit if gdbserver setup failed if [[ "$?" != "0" ]]; then @@ -18,7 +38,7 @@ sleep 2 # variables that must match those in gdb_server GDB_TMP_DIR=$(pwd)/android_gdb_tmp -APP_NAME=$(basename $1) +APP_NAME=$(basename ${gdbVars[0]}) PORT=5039 # Set up gdb commands @@ -37,7 +57,12 @@ source $SCRIPT_DIR/android_setup.sh # Launch gdb client echo "Entering gdb client shell" -$ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP +if [ "$ANDROID_ARCH" == "x86" ] +then + $ANDROID_TOOLCHAIN/i686-linux-android-gdb -x $GDBSETUP +else + $ANDROID_TOOLCHAIN/arm-linux-androideabi-gdb -x $GDBSETUP +fi # Clean up -rm -rf $GDB_TMP_DIR
\ No newline at end of file +rm -rf $GDB_TMP_DIR |