Fix 'debugging on Android' android_gdb_app script.

platform_tools/android/bin/android_gdb_app

Index: platform_tools/android/bin/android_gdb_app
diff --git a/platform_tools/android/bin/android_gdb_app b/platform_tools/android/bin/android_gdb_app
index 31cf99148f719cf80bc5b7f9e5852387c902be23..f0879fa10ff42b433206b4de160bd3882d5e222a 100755
--- a/platform_tools/android/bin/android_gdb_app
+++ b/platform_tools/android/bin/android_gdb_app
@@ -4,7 +4,7 @@
 # the debugging environment.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source $SCRIPT_DIR/android_setup.sh
+source $SCRIPT_DIR/android_setup.sh "$@"

[djsollen, 2015/12/10 21:01:37]

I don't think this line is necessary.

[aam, 2015/12/10 21:16:53]

If I comment this line out, I get
===
$ ./platform_tools/android/bin/android_gdb_app -d nexus_6
mkdir: cannot create directory ‘/android_gdb_tmp’: Permission denied
Copying symbol files
./platform_tools/android/bin/android_gdb_app: line 32: adb_pull_if_needed:
command not found
./platform_tools/android/bin/android_gdb_app: line 33: adb_pull_if_needed:
command not found
./platform_tools/android/bin/android_gdb_app: line 34: adb_pull_if_needed:
command not found
./platform_tools/android/bin/android_gdb_app: line 35: adb_pull_if_needed:
command not found
Pushing gdbserver...
===

it seems that this script relies on at least SKIA_OUT variable defined and
exported by android_setup.sh:179.

 
 APP_NAME=${APP_ARGS[0]}
 PORT=5039
@@ -31,21 +31,21 @@ mkdir -p $GDB_TMP_DIR
 echo "Copying symbol files"
 adb_pull_if_needed /system/bin/app_process $GDB_TMP_DIR
 adb_pull_if_needed /system/lib/libc.so $GDB_TMP_DIR
-adb_pull_if_needed /data/data/com.skia/lib/libskia_android.so $GDB_TMP_DIR
-adb_pull_if_needed /data/data/com.skia/lib/libSampleApp.so $GDB_TMP_DIR
+adb_pull_if_needed /data/data/com.skia.sample_app/lib/libskia_android.so $GDB_TMP_DIR
+adb_pull_if_needed /data/data/com.skia.sample_app/lib/libSampleApp.so $GDB_TMP_DIR
 
 echo "Pushing gdbserver..."
 adb_push_if_needed $ANDROID_TOOLCHAIN/../gdbserver /data/local/tmp
 
 # Launch the app
 echo "Launching the app..."
-$ADB $DEVICE_SERIAL shell am start -n com.skia/com.skia.SkiaSampleActivity
+$ADB $DEVICE_SERIAL shell am start -n com.skia.sample_app/com.skia.SkiaSampleActivity
 
 # Wait for app process to initialize
 sleep 2
 
 # Attach gdbserver to the app process
-PID=$($ADB shell ps | grep com.skia | awk '{print $2}')
+PID=$($ADB shell ps | grep com.skia.sample_app | awk '{print $2}')
 echo "Attaching to pid: $PID"
 $ADB $DEVICE_SERIAL shell /data/local/tmp/gdbserver :$PORT --attach $PID &