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

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

Issue 398733002: Make gdb work for 64-bit Skia (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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
« no previous file with comments | « platform_tools/android/bin/android_gdb_exe ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
11 11
12 BUILD_DIR="${SKIA_OUT}/${BUILDTYPE}" 12 BUILD_DIR="${SKIA_OUT}/${BUILDTYPE}"
13 TARGET_LIBRARY="${BUILD_DIR}/lib/lib${APP_NAME}.so" 13 TARGET_LIBRARY="${BUILD_DIR}/lib/lib${APP_NAME}.so"
14 if [ ! -f "$TARGET_LIBRARY" ] 14 if [ ! -f "$TARGET_LIBRARY" ]
15 then 15 then
16 echo "Unable to find the ${APP_NAME} library at ${TARGET_LIBRARY}." 16 echo "Unable to find the ${APP_NAME} library at ${TARGET_LIBRARY}."
17 exit 1 17 exit 1
18 fi 18 fi
19 19
20 # We need the debug symbols from these files 20 # We need the debug symbols from these files
21 GDB_TMP_DIR=$(pwd)/android_gdb_tmp 21 GDB_TMP_DIR=$(pwd)/android_gdb_tmp
22 mkdir -p $GDB_TMP_DIR 22 mkdir -p $GDB_TMP_DIR
23 23
24 echo "Copying symbol files" 24 echo "Copying symbol files"
25 SYSTEM_LIBRARY_PATH=/system/lib 25 if [[ $ANDROID_ARCH == *64* ]]; then
26 SYSTEM_LIBRARY_PATH=/system/lib64
27 else
28 SYSTEM_LIBRARY_PATH=/system/lib
29 fi
26 for library_file in \ 30 for library_file in \
27 libc.so \ 31 libc.so \
28 libstdc++.so \ 32 libstdc++.so \
29 libm.so \ 33 libm.so \
30 liblog.so \ 34 liblog.so \
31 libz.so \ 35 libz.so \
32 libgccdemangle.so \ 36 libgccdemangle.so \
33 libcorkscrew.so \ 37 libcorkscrew.so \
34 libutils.so \ 38 libutils.so \
35 libstlport.so \ 39 libstlport.so \
(...skipping 22 matching lines...) Expand all
58 echo "Setting up port forward" 62 echo "Setting up port forward"
59 $ADB forward "tcp:5039" "tcp:5039" 63 $ADB forward "tcp:5039" "tcp:5039"
60 64
61 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors. 65 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors.
62 echo "Killing any running Skia processes." 66 echo "Killing any running Skia processes."
63 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill 67 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill
64 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill 68 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill
65 69
66 # Starting up gdbserver in android shell 70 # Starting up gdbserver in android shell
67 echo "Starting gdbserver with command: ${APP_ARGS[@]}" 71 echo "Starting gdbserver with command: ${APP_ARGS[@]}"
68 $ADB shell /data/local/tmp/gdbserver :5039 /data/local/tmp/skia_launcher ${APP_A RGS[@]} & 72 $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_exe ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698