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

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

Issue 718793003: Revert of Move from libstlport to libc++ for Android framework builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | platform_tools/android/bin/android_perf » ('j') | 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
(...skipping 11 matching lines...) Expand all
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 if [[ $ANDROID_ARCH == *64* ]]; then 25 if [[ $ANDROID_ARCH == *64* ]]; then
26 SYSTEM_LIBRARY_PATH=/system/lib64 26 SYSTEM_LIBRARY_PATH=/system/lib64
27 else 27 else
28 SYSTEM_LIBRARY_PATH=/system/lib 28 SYSTEM_LIBRARY_PATH=/system/lib
29 fi 29 fi
30 for library_file in \ 30 for library_file in \
31 libc.so \ 31 libc.so \
32 libc++.so \
33 libstdc++.so \ 32 libstdc++.so \
34 libm.so \ 33 libm.so \
35 liblog.so \ 34 liblog.so \
36 libz.so \ 35 libz.so \
37 libgccdemangle.so \ 36 libgccdemangle.so \
38 libsigchain.so \ 37 libsigchain.so \
39 libcutils.so \ 38 libcutils.so \
40 libunwind.so \ 39 libunwind.so \
41 libunwind-ptrace.so \ 40 libunwind-ptrace.so \
42 libbacktrace.so \ 41 libbacktrace.so \
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 $ADB forward "tcp:5039" "tcp:5039" 74 $ADB forward "tcp:5039" "tcp:5039"
76 75
77 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors. 76 # Kill all previous instances of gdbserver and the app to rid all port overridin g errors.
78 echo "Killing any running Skia processes." 77 echo "Killing any running Skia processes."
79 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill 78 $ADB shell ps | grep gdbserver | awk '{print $2}' | xargs $ADB shell kill
80 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill 79 $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill
81 80
82 # Starting up gdbserver in android shell 81 # Starting up gdbserver in android shell
83 echo "Starting gdbserver with command: ${APP_ARGS[@]}" 82 echo "Starting gdbserver with command: ${APP_ARGS[@]}"
84 $ADB shell LD_LIBRARY_PATH=/data/local/tmp:\$LD_LIBRARY_PATH /data/local/tmp/gdb server :5039 /data/local/tmp/skia_launcher ${APP_ARGS[@]} & 83 $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 | « no previous file | platform_tools/android/bin/android_perf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698