diff options
| author |  qiankun.miao <qiankun.miao@intel.com> | 2014-07-17 08:18:23 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-17 08:18:23 -0700 |
| commit | ac298384b33efaa9e87431dd42a7270753de9864 (patch) | |
| tree | 8ca6f5e711f3e7f9d64ef50dd14555c08dd7b366 /platform_tools/android | |
| parent | 929f29a5c1bffa7f7c1b5a376351d0762b8ac561 (diff) | |
Fix warning about missing shared library symbols in android_gdbserver
Grab related shared libraryies. Remove libcorkscrew.so due libcorkscrew
is removed from AOSP.
BUG=skia:
R=djsollen@google.com
Author: qiankun.miao@intel.com
Review URL: https://codereview.chromium.org/399843002
Diffstat (limited to 'platform_tools/android')
| -rwxr-xr-x | platform_tools/android/bin/android_gdbserver | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/platform_tools/android/bin/android_gdbserver b/platform_tools/android/bin/android_gdbserver index 6f48d0c8b7..b1391c737f 100755 --- a/platform_tools/android/bin/android_gdbserver +++ b/platform_tools/android/bin/android_gdbserver @@ -34,17 +34,28 @@ for library_file in \ liblog.so \ libz.so \ libgccdemangle.so \ - libcorkscrew.so \ + libsigchain.so \ + libcutils.so \ + libunwind.so \ + libunwind-ptrace.so \ + libbacktrace.so \ libutils.so \ libstlport.so \ libGLES_trace.so \ libEGL.so \ libGLESv2.so \ ; do - adb_pull_if_needed "${SYSTEM_LIBRARY_PATH}/${library_file}" $GDB_TMP_DIR + ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld ${SYSTEM_LIBRARY_PATH}/${library_file}` + if [ "${ANDROID_LS:0:1}" == "-" ]; then + adb_pull_if_needed "${SYSTEM_LIBRARY_PATH}/${library_file}" $GDB_TMP_DIR + fi done -adb_pull_if_needed /system/bin/linker $GDB_TMP_DIR +if [[ $ANDROID_ARCH == *64* ]]; then + adb_pull_if_needed /system/bin/linker64 $GDB_TMP_DIR +else + adb_pull_if_needed /system/bin/linker $GDB_TMP_DIR +fi echo "Pushing app..." for file in \ |