From edea842b6a678f8c06d136a808def83880a4ca88 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Date: Tue, 29 Apr 2014 21:00:06 +0000 Subject: Revert of Improve Android scripts: (https://codereview.chromium.org/254923003/) Reason for revert: errors Original issue's description: > Improve Android scripts: > > * android_gdbserver: > - Don't complain if $GDB_TMP_DIR already exists > - Since $GDB_TMP_DIR/gdb.setup might already exist, overwrite the file. > > * android_run_skia: > - Move resource files onto the device. > - Change to tmp directory before executing program. > > * android_make, android_setup: > - stop assuming PWD is skia source directory. > > NOTRY=true > > Committed: http://code.google.com/p/skia/source/detail?r=14442 R=djsollen@google.com, scroggo@google.com TBR=djsollen@google.com, scroggo@google.com NOTREECHECKS=true NOTRY=true Author: halcanary@google.com Review URL: https://codereview.chromium.org/254073003 git-svn-id: http://skia.googlecode.com/svn/trunk@14448 2bbb7eff-a529-9590-31e7-b0007b416f81 --- platform_tools/android/bin/android_gdb_exe | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'platform_tools/android/bin/android_gdb_exe') diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdb_exe index 64be9bbd38..920a16b38a 100755 --- a/platform_tools/android/bin/android_gdb_exe +++ b/platform_tools/android/bin/android_gdb_exe @@ -25,19 +25,15 @@ PORT=5039 # Set up gdb commands GDBSETUP=$GDB_TMP_DIR/gdb.setup -{ - echo "file ${GDB_TMP_DIR}/skia_launcher" - echo "target remote :${PORT}" - echo "set solib-absolute-prefix ${GDB_TMP_DIR}" - echo "set solib-search-path ${GDB_TMP_DIR} - - # The apps shared library symbols are not loaded by default so we - # load them here." - echo "break launch_app" - echo "continue" - echo "sharedLibrary ${APP_NAME}" -} > $GDBSETUP - +echo "file $GDB_TMP_DIR/skia_launcher" >> $GDBSETUP +echo "target remote :$PORT" >> $GDBSETUP +echo "set solib-absolute-prefix $GDB_TMP_DIR" >> $GDBSETUP +echo "set solib-search-path $GDB_TMP_DIR" >> $GDBSETUP + +# The apps shared library symbols are not loaded by default so we load them here +echo "break launch_app" >> $GDBSETUP +echo "continue" >> $GDBSETUP +echo "sharedLibrary $APP_NAME" >> $GDBSETUP # Launch gdb client echo "Entering gdb client shell" -- cgit v1.2.3