commit a8d89e15f0fe4e3e5156526e25e51a7901b57b68
author Torne (Richard Coles) <torne@google.com> Mon Mar 11 16:31:08 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 11 16:31:09 2013 +0000
tree 02a075da3ac643bdf6c2423b69784911aa02db64
parent bacedf66d2ecf05d100cf830d6dc4bd22f8562e7
parent 71f8b245ce553452c1a0691aaf225e6fad5aecd6

Merge "Don't try to group static libraries on mac." into jb-mr2-dev

envsetup.sh

diff --git a/envsetup.sh b/envsetup.sh
index 15ce152..542d7b2 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -825,6 +825,11 @@
     fi
 }
 
+function gdbwrapper()
+{
+    $ANDROID_TOOLCHAIN/$GDB -x "$@"
+}
+
 function gdbclient()
 {
    local OUT_ROOT=$(get_abs_build_var PRODUCT_OUT)
@@ -892,7 +897,7 @@
        echo >>"$OUT_ROOT/gdbclient.cmds" "target remote $PORT"
        echo >>"$OUT_ROOT/gdbclient.cmds" ""
 
-       $ANDROID_TOOLCHAIN/$GDB -x "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
+       gdbwrapper "$OUT_ROOT/gdbclient.cmds" "$OUT_EXE_SYMBOLS/$EXE"
   else
        echo "Unable to determine build system output dir."
    fi