commit 80f7dbd4deb0a765eaf4a697ea3bcc2e5f2c5b3b
author Colin Cross <ccross@android.com> Thu Apr 10 20:15:21 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 10 20:15:22 2014 +0000
tree 46bab4d4d56901ff1e8840e36f2ba4a3dc58a328
parent 13eaf184f6e5c803f52f5003ace36bafe64671c9
parent 84480ad0ee651ce438f75306a56779065a2cbc6d

Merge "gdbclient: use 64-bit suffix for all library symbols"

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 5ed3dc1..3b9423b 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1021,8 +1021,10 @@
                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" ""