Merge "Make gdbclient respect custom OUT_DIR settings"

2016-01-07 18:05:26 +00:00
parent c67f5d0539 35dd4d66b6
commit 7c776a4fb3
1 changed files with 2 additions and 1 deletions
--- a/scripts/gdbclient
+++ b/scripts/gdbclient
@@ -65,7 +65,8 @@ function gdbclient() {
    ROOT=`realpath .`
  fi

-  local OUT_ROOT="$ROOT/out/target/product/$DEVICE"
+  local SYS_OUT_ROOT=$(get_build_var OUT_DIR)
+  local OUT_ROOT="${SYS_OUT_ROOT:-${OUT_DIR:-$ROOT/out}}/target/product/$DEVICE"
  local SYMBOLS_DIR="$OUT_ROOT/symbols"
  local IS_TAPAS_USER="$(get_build_var TARGET_BUILD_APPS)"
  local TAPAS_SYMBOLS_DIR=