aboutsummaryrefslogtreecommitdiffhomepage
path: root/platform_tools/android/bin/android_gdbserver
diff options
context:
space:
mode:
authorGravatar qiankun.miao <qiankun.miao@intel.com>2014-07-16 13:21:15 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-16 13:21:15 -0700
commitd75547925d522cfc922e7f73ab0d69076972199c (patch)
tree3e6df2156930d1be9e37c363b165338e96c763ce /platform_tools/android/bin/android_gdbserver
parentdddf564ee7e8dfb116b93779d8b85b488b4300dd (diff)
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
Diffstat (limited to 'platform_tools/android/bin/android_gdbserver')
-rwxr-xr-xplatform_tools/android/bin/android_gdbserver8
1 files changed, 6 insertions, 2 deletions
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[@]} &