| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 # | 6 # |
| 7 | 7 |
| 8 # A generic script used to attach to a running Chromium process and | 8 # A generic script used to attach to a running Chromium process and |
| 9 # debug it. Most users should not use this directly, but one of the | 9 # debug it. Most users should not use this directly, but one of the |
| 10 # wrapper scripts like adb_gdb_content_shell | 10 # wrapper scripts like adb_gdb_content_shell |
| (...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 466 # $1: NDK install path | 466 # $1: NDK install path |
| 467 # $2: NDK architecture name | 467 # $2: NDK architecture name |
| 468 # $3: prebuilt sub-path to look for. | 468 # $3: prebuilt sub-path to look for. |
| 469 # Out: file path, or empty if none is found. | 469 # Out: file path, or empty if none is found. |
| 470 get_ndk_toolchain_prebuilt () { | 470 get_ndk_toolchain_prebuilt () { |
| 471 local NDK_DIR="${1%/}" | 471 local NDK_DIR="${1%/}" |
| 472 local ARCH="$2" | 472 local ARCH="$2" |
| 473 local SUBPATH="$3" | 473 local SUBPATH="$3" |
| 474 local NAME="$(get_arch_toolchain_prefix $ARCH)" | 474 local NAME="$(get_arch_toolchain_prefix $ARCH)" |
| 475 local FILE TARGET | 475 local FILE TARGET |
| 476 FILE=$NDK_DIR/toolchains/$NAME-4.8/prebuilt/$SUBPATH | 476 FILE=$NDK_DIR/toolchains/$NAME-4.9/prebuilt/$SUBPATH |
| 477 if [ ! -f "$FILE" ]; then | 477 if [ ! -f "$FILE" ]; then |
| 478 FILE=$NDK_DIR/toolchains/$NAME-4.9/prebuilt/$SUBPATH | 478 FILE=$NDK_DIR/toolchains/$NAME-4.8/prebuilt/$SUBPATH |
| 479 if [ ! -f "$FILE" ]; then | 479 if [ ! -f "$FILE" ]; then |
| 480 FILE=$NDK_DIR/toolchains/$NAME-4.6/prebuilt/$SUBPATH | 480 FILE= |
| 481 if [ ! -f "$FILE" ]; then | |
| 482 FILE= | |
| 483 fi | |
| 484 fi | 481 fi |
| 485 fi | 482 fi |
| 486 echo "$FILE" | 483 echo "$FILE" |
| 487 } | 484 } |
| 488 | 485 |
| 489 # Find the path to an NDK's toolchain full prefix for a given architecture | 486 # Find the path to an NDK's toolchain full prefix for a given architecture |
| 490 # $1: NDK install path | 487 # $1: NDK install path |
| 491 # $2: NDK target architecture name | 488 # $2: NDK target architecture name |
| 492 # Out: install path + binary prefix (e.g. | 489 # Out: install path + binary prefix (e.g. |
| 493 # ".../path/to/bin/arm-linux-androideabi-") | 490 # ".../path/to/bin/arm-linux-androideabi-") |
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1008 | 1005 |
| 1009 if [ "$VERBOSE" -gt 0 ]; then | 1006 if [ "$VERBOSE" -gt 0 ]; then |
| 1010 echo "### START $COMMANDS" | 1007 echo "### START $COMMANDS" |
| 1011 cat $COMMANDS | 1008 cat $COMMANDS |
| 1012 echo "### END $COMMANDS" | 1009 echo "### END $COMMANDS" |
| 1013 fi | 1010 fi |
| 1014 | 1011 |
| 1015 log "Launching gdb client: $GDB $GDB_ARGS -x $COMMANDS" | 1012 log "Launching gdb client: $GDB $GDB_ARGS -x $COMMANDS" |
| 1016 $GDB $GDB_ARGS -x $COMMANDS && | 1013 $GDB $GDB_ARGS -x $COMMANDS && |
| 1017 rm -f "$GDBSERVER_PIDFILE" | 1014 rm -f "$GDBSERVER_PIDFILE" |
| OLD | NEW |