Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Side by Side Diff: platform_tools/android/bin/android_gdbserver

Issue 1900773002: Update android toolchain variable to point to root dir and not the bin (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # 2 #
3 # android_gdbserver: Pushes gdbserver. Starts debugging environment. 3 # android_gdbserver: Pushes gdbserver. Starts debugging environment.
4 4
5 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" 5 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
6 source $SCRIPT_DIR/android_setup.sh 6 source $SCRIPT_DIR/android_setup.sh
7 source $SCRIPT_DIR/utils/setup_adb.sh 7 source $SCRIPT_DIR/utils/setup_adb.sh
8 8
9 APP_NAME=${APP_ARGS[0]} 9 APP_NAME=${APP_ARGS[0]}
10 PORT=5039 10 PORT=5039
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 for file in \ 58 for file in \
59 "${BUILD_DIR}/skia_launcher" \ 59 "${BUILD_DIR}/skia_launcher" \
60 "${BUILD_DIR}/lib/libskia_android.so" \ 60 "${BUILD_DIR}/lib/libskia_android.so" \
61 "${BUILD_DIR}/lib/lib${APP_NAME}.so" \ 61 "${BUILD_DIR}/lib/lib${APP_NAME}.so" \
62 ; do 62 ; do
63 cp "$file" $GDB_TMP_DIR 63 cp "$file" $GDB_TMP_DIR
64 adb_push_if_needed "$file" /data/local/tmp 64 adb_push_if_needed "$file" /data/local/tmp
65 done 65 done
66 66
67 echo "Pushing gdbserver..." 67 echo "Pushing gdbserver..."
68 adb_push_if_needed $ANDROID_TOOLCHAIN/../gdbserver /data/local/tmp 68 adb_push_if_needed $ANDROID_TOOLCHAIN/gdbserver /data/local/tmp
69 69
70 echo "Setting up port forward" 70 echo "Setting up port forward"
71 $ADB forward "tcp:5039" "tcp:5039" 71 $ADB forward "tcp:5039" "tcp:5039"
72 72
73 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors. 73 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors.
74 echo "Killing any running Skia processes." 74 echo "Killing any running Skia processes."
75 set +e 75 set +e
76 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill 2> /de v/null 76 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill 2> /de v/null
77 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill 2> / dev/null 77 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill 2> / dev/null
78 set -e 78 set -e
79 79
80 # Starting up gdbserver in android shell 80 # Starting up gdbserver in android shell
81 echo "Starting gdbserver with command: ${APP_ARGS[@]}" 81 echo "Starting gdbserver with command: ${APP_ARGS[@]}"
82 $ADB shell LD_LIBRARY_PATH=/data/local/tmp:\$LD_LIBRARY_PATH /data/local/tmp/gdb server :5039 /data/local/tmp/skia_launcher ${APP_ARGS[@]} & 82 $ADB shell LD_LIBRARY_PATH=/data/local/tmp:\$LD_LIBRARY_PATH /data/local/tmp/gdb server :5039 /data/local/tmp/skia_launcher ${APP_ARGS[@]} &
OLDNEW
« no previous file with comments | « platform_tools/android/bin/android_gdb_native ('k') | platform_tools/android/bin/utils/setup_toolchain.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698