AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

android_gdbserver: Don't fail when trying to locate nonexistent files

Browse Source 
Without '-x', exit codes of remote commands are forwarded to the host,
causing the shell script to terminate early.

Change-Id: I4cd8357277e22cc6d616d31bc83ba228eb8c2940
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/241363
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
This commit is contained in:
Brian Osman 2019-09-13 16:21:07 -04:00 committed by Skia Commit-Bot
parent 6447a1a777
commit 3bd566ee5c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform_tools/android/bin/android_gdbserver
View File

@ -49,7 +49,7 @@ for library_file in \
libEGL.so \
libGLESv2.so \
; do
ANDROID_LS=`$ADB $DEVICE_SERIAL shell ls -ld ${SYSTEM_LIBRARY_PATH}/${library_file}`
ANDROID_LS=`$ADB $DEVICE_SERIAL shell -x 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