diff options
| author | haitao.feng@intel.com <haitao.feng@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 09:47:23 +0000 |
|---|---|---|
| committer | haitao.feng@intel.com <haitao.feng@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 09:47:23 +0000 |
| commit | bd19b2ed4dc6c19676f381fc55eb8bd6eb3fb2ca (patch) | |
| tree | 006a382783ca3c6952481b8222114185384326e3 /build | |
| parent | 7021599155b9a34a26a02fe5fa4c50282ccb5d04 (diff) | |
| download | chromium_src-bd19b2ed4dc6c19676f381fc55eb8bd6eb3fb2ca.zip chromium_src-bd19b2ed4dc6c19676f381fc55eb8bd6eb3fb2ca.tar.gz chromium_src-bd19b2ed4dc6c19676f381fc55eb8bd6eb3fb2ca.tar.bz2 | |
Add native debugging support for no-root mode
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10448096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/android/gdb_content_shell | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/build/android/gdb_content_shell b/build/android/gdb_content_shell index 94c0962..2f0b983 100755 --- a/build/android/gdb_content_shell +++ b/build/android/gdb_content_shell @@ -17,12 +17,12 @@ if [[ "$adb" = "" ]] ; then exit 1 fi -# TODO(jrg): non-rooted path speculative and untested. -rooted_phone=1 +rooted_phone=0 root=$(dirname $0)/../.. package_name=org.chromium.content_shell -gdb_server_on_device=/data/data/$package_name/lib/gdbserver +data_dir=/data/data/$package_name +gdb_server_on_device=$data_dir/lib/gdbserver shared_lib_dir=$root/out/Release/lib.target # Kill any running gdbserver @@ -50,15 +50,12 @@ if [[ "$no_gdb_server" != "" ]] ; then exit 3 fi -adb forward tcp:4321 tcp:4321 - -# TODO(jrg): Consider a closer match to ndk-gdb which uses subtly -# different semantics for both port forwarding and launching -# gdbserver. if [[ $rooted_phone -eq 1 ]] ; then adb shell $gdb_server_on_device :4321 --attach $pid & + adb forward tcp:4321 tcp:4321 else - adb shell run-as $package_name $gdb_server_on_device :4321 --attach $pid & + adb shell run-as $package_name lib/gdbserver +debug-socket --attach $pid & + adb forward tcp:4321 localfilesystem:$data_dir/debug-socket fi sleep 2 |