From 84480ad0ee651ce438f75306a56779065a2cbc6d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 10 Apr 2014 12:51:39 -0700 Subject: [PATCH] gdbclient: use 64-bit suffix for all library symbols Correct the solib-search-path for 64-bit to look in /system/lib64 for all libraries including those in subdirectories. Change-Id: I606a0eae1137a857564facc79306ad83097d9659 --- envsetup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/envsetup.sh b/envsetup.sh index 5ed3dc153..3b9423b67 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1021,8 +1021,10 @@ function gdbclient() echo "" fi + OUT_SO_SYMBOLS=$OUT_SO_SYMBOLS$USE64BIT + echo >|"$OUT_ROOT/gdbclient.cmds" "set solib-absolute-prefix $OUT_SYMBOLS" - echo >>"$OUT_ROOT/gdbclient.cmds" "set solib-search-path $OUT_SO_SYMBOLS$USE64BIT:$OUT_SO_SYMBOLS/hw:$OUT_SO_SYMBOLS/ssl/engines:$OUT_SO_SYMBOLS/drm:$OUT_SO_SYMBOLS/egl:$OUT_SO_SYMBOLS/soundfx" + echo >>"$OUT_ROOT/gdbclient.cmds" "set solib-search-path $OUT_SO_SYMBOLS:$OUT_SO_SYMBOLS/hw:$OUT_SO_SYMBOLS/ssl/engines:$OUT_SO_SYMBOLS/drm:$OUT_SO_SYMBOLS/egl:$OUT_SO_SYMBOLS/soundfx" echo >>"$OUT_ROOT/gdbclient.cmds" "source $ANDROID_BUILD_TOP/development/scripts/gdb/dalvik.gdb" echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT" echo >>"$OUT_ROOT/gdbclient.cmds" ""