Merge "Make gdbclient respect custom OUT_DIR settings"

am: 7c776a4fb3

* commit '7c776a4fb31cf38596e701fadf424abb5f37364d':
  Make gdbclient respect custom OUT_DIR settings
This commit is contained in:
Alex Light
2016-01-07 18:10:00 +00:00
committed by android-build-merger

View File

@@ -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=