Make gdb work for 64-bit Skia

BUG=skia:
R=djsollen@google.com

Author: qiankun.miao@intel.com

Review URL: https://codereview.chromium.org/398733002

2 files changed, 11 insertions, 4 deletions

diff --git a/platform_tools/android/bin/android_gdb_exe b/platform_tools/android/bin/android_gdb_exe
index 64be9bbd38..4229994912 100755
--- a/platform_tools/android/bin/android_gdb_exe
+++ b/platform_tools/android/bin/android_gdb_exe
@@ -29,13 +29,16 @@ 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}
+    echo "set solib-search-path ${GDB_TMP_DIR}"
 
     # The apps shared library symbols are not loaded by default so we
-    # load them here."
+    # load them here.
     echo "break launch_app"
     echo "continue"
     echo "sharedLibrary ${APP_NAME}"
+
+    # Load libskia_android.so here.
+    echo "sharedLibrary skia_android"
 } > $GDBSETUP
 
 
diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver
index 0436faa5c7..6f48d0c8b7 100755
--- a/platform_tools/android/bin/android_gdbserver
+++ b/platform_tools/android/bin/android_gdbserver
@@ -22,7 +22,11 @@ GDB_TMP_DIR=$(pwd)/android_gdb_tmp
 mkdir -p $GDB_TMP_DIR
 
 echo "Copying symbol files"
-SYSTEM_LIBRARY_PATH=/system/lib
+if [[ $ANDROID_ARCH == *64* ]]; then
+  SYSTEM_LIBRARY_PATH=/system/lib64
+else
+  SYSTEM_LIBRARY_PATH=/system/lib
+fi
 for library_file in \
     libc.so \
     libstdc++.so \
@@ -65,4 +69,4 @@ $ADB shell ps | grep ${APP_NAME} | awk '{print $2}' | xargs $ADB shell kill
 
 # Starting up gdbserver in android shell
 echo "Starting gdbserver with command: ${APP_ARGS[@]}"
-$ADB shell /data/local/tmp/gdbserver :5039 /data/local/tmp/skia_launcher ${APP_ARGS[@]} &
+$ADB shell LD_LIBRARY_PATH=/data/local/tmp:\$LD_LIBRARY_PATH /data/local/tmp/gdbserver :5039 /data/local/tmp/skia_launcher ${APP_ARGS[@]} &