Android: fixes out dir for adb_gdb with cr tool.

build/android/adb_gdb

 #!/bin/bash
 #
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 # A generic script used to attach to a running Chromium process and
 # debug it. Most users should not use this directly, but one of the
 # wrapper scripts like adb_gdb_content_shell
 #
 # Use --help to print full usage instructions.
 #
 
 PROGNAME=$(basename "$0")
 PROGDIR=$(dirname "$0")
 
 # Location of Chromium-top-level sources.
 CHROMIUM_SRC=$(cd "$PROGDIR"/../.. && pwd 2>/dev/null)
 
+# Location of Chromium out/ directory.
+if [ -z "$CHROMIUM_OUT_DIR" ]; then
+  CHROMIUM_OUT_DIR=out
+fi
+
 TMPDIR=
 GDBSERVER_PIDFILE=
 TARGET_GDBSERVER=
 
 clean_exit () {
   if [ "$TMPDIR" ]; then
     GDBSERVER_PID=$(cat $GDBSERVER_PIDFILE 2>/dev/null)
     if [ "$GDBSERVER_PID" ]; then
       log "Killing background gdbserver process: $GDBSERVER_PID"
       kill -9 $GDBSERVER_PID >/dev/null 2>&1
@@ skipping 129 matching lines @@
       ;;
     --start)
       START=true
       ;;
     --su-prefix=*)
       SU_PREFIX=$optarg
       ;;
     --symbol-dir=*)
       SYMBOL_DIR=$optarg
       ;;
+    --out-dir=*)
+      CHROMIUM_OUT_DIR=$optarg
+      ;;
     --target-arch=*)
       TARGET_ARCH=$optarg
       ;;
     --toolchain=*)
       TOOLCHAIN=$optarg
       ;;
     --ui)
       GDBEXEPOSTFIX=gdbtui
       ;;
     --verbose)
@@ skipping 61 matching lines @@
 find all of them automatically. This is the recommended way to use it.
 
 Otherwise, if you have ANDROID_NDK_ROOT defined in your environment,
 the script will use it to find the gdb and gdbserver binaries. You can
 also use --ndk-dir=<path> to specify an alternative NDK installation
 directory.
 
 The script tries to find the most recent version of the debug version of
 shared libraries under one of the following directories:
 
-  \$CHROMIUM_SRC/out/Release/lib/           (used by Ninja builds)
-  \$CHROMIUM_SRC/out/Debug/lib/             (used by Ninja builds)
-  \$CHROMIUM_SRC/out/Release/lib.target/    (used by Make builds)
-  \$CHROMIUM_SRC/out/Debug/lib.target/      (used by Make builds)
+  \$CHROMIUM_SRC/<out>/Release/lib/           (used by Ninja builds)
+  \$CHROMIUM_SRC/<out>/Debug/lib/             (used by Ninja builds)
+  \$CHROMIUM_SRC/<out>/Release/lib.target/    (used by Make builds)
+  \$CHROMIUM_SRC/<out>/Debug/lib.target/      (used by Make builds)
+
+Where <out> is 'out' by default, unless the --out=<name> option is used or
+the CHROMIUM_OUT_DIR environment variable is defined.
 
 You can restrict this search by using --release or --debug to specify the
 build type, or simply use --symbol-dir=<path> to specify the file manually.
 
 The script tries to extract the target architecture from your GYP_DEFINES,
 but if this fails, will default to 'arm'. Use --target-arch=<name> to force
 its value.
 
 Otherwise, the script will complain, but you can use the --gdbserver,
 --gdb and --symbol-lib options to specify everything manually.
@@ skipping 23 matching lines @@
 will be passed to gdb after the remote connection and library symbol
 loading have completed.
 
 Valid options:
   --help|-h|-?          Print this message.
   --verbose             Increase verbosity.
 
   --sandboxed           Debug first sandboxed process we find.
   --sandboxed=<num>     Debug specific sandboxed process.
   --symbol-dir=<path>   Specify directory with symbol shared libraries.
+  --out-dir=<path>      Specify the out directory.
   --package-name=<name> Specify package name (alternative to 1st argument).
   --program-name=<name> Specify program name (cosmetic only).
   --pid=<pid>           Specify application process pid.
   --force               Kill any previous debugging session, if any.
   --start               Start package's activity on device.
   --ui                  Use gdbtui instead of gdb
   --activity=<name>     Activity name for --start [$DEFAULT_ACTIVITY].
   --annotate=<num>      Enable gdb annotation.
   --script=<file>       Specify extra GDB init script.
 
@@ skipping 357 matching lines @@
 
 # Return the timestamp of a given time, as number of seconds since epoch.
 # $1: file path
 # Out: file timestamp
 get_file_timestamp () {
   stat -c %Y "$1" 2>/dev/null
 }
 
 # Detect the build type and symbol directory. This is done by finding
 # the most recent sub-directory containing debug shared libraries under
-# $CHROMIUM_SRC/out/
+# $CHROMIUM_SRC/$CHROMIUM_OUT_DIR/
 #
 # $1: $BUILDTYPE value, can be empty
 # Out: nothing, but this sets SYMBOL_DIR
 #
 detect_symbol_dir () {
   local SUBDIRS SUBDIR LIST DIR DIR_LIBS TSTAMP
   # Note: Ninja places debug libraries under out/$BUILDTYPE/lib/, while
   # Make places then under out/$BUILDTYPE/lib.target.
   if [ "$1" ]; then
     SUBDIRS="$1/lib $1/lib.target"
   else
     SUBDIRS="Release/lib Debug/lib Release/lib.target Debug/lib.target"
   fi
   LIST=$TMPDIR/scan-subdirs-$$.txt
   printf "" > "$LIST"
   for SUBDIR in $SUBDIRS; do
-    DIR=$CHROMIUM_SRC/out/$SUBDIR
+    DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$SUBDIR
     if [ -d "$DIR" ]; then
       # Ignore build directories that don't contain symbol versions
       # of the shared libraries.
       DIR_LIBS=$(ls "$DIR"/lib*.so 2>/dev/null)
       if [ -z "$DIR_LIBS" ]; then
         echo "No shared libs: $DIR"
         continue
       fi
       TSTAMP=$(get_file_timestamp "$DIR")
       printf "%s %s\n" "$TSTAMP" "$SUBDIR" >> "$LIST"
     fi
   done
   SUBDIR=$(cat $LIST | sort -r | head -1 | cut -d" " -f2)
   rm -f "$LIST"
 
   if [ -z "$SUBDIR" ]; then
     if [ -z "$1" ]; then
       panic "Could not find any build directory under \
-$CHROMIUM_SRC/out. Please build the program first!"
+$CHROMIUM_SRC/$CHROMIUM_OUT_DIR. Please build the program first!"
     else
       panic "Could not find any $1 directory under \
-$CHROMIUM_SRC/out. Check your build type!"
+$CHROMIUM_SRC/$CHROMIUM_OUT_DIR. Check your build type!"
     fi
   fi
 
-  SYMBOL_DIR=$CHROMIUM_SRC/out/$SUBDIR
+  SYMBOL_DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$SUBDIR
   log "Auto-config: --symbol-dir=$SYMBOL_DIR"
 }
 
 if [ -z "$SYMBOL_DIR" ]; then
   detect_symbol_dir "$BUILDTYPE"
 fi
 
 # Allow several concurrent debugging sessions
 TARGET_GDBSERVER=/data/local/tmp/gdbserver-adb-gdb-$TMP_ID
 
@@ skipping 230 matching lines @@
 
 if [ "$VERBOSE" -gt 0 ]; then
   echo "### START $COMMANDS"
   cat $COMMANDS
   echo "### END $COMMANDS"
 fi
 
 log "Launching gdb client: $GDB $GDBARGS -x $COMMANDS"
 $GDB $GDBARGS -x $COMMANDS &&
 rm -f "$GDBSERVER_PIDFILE"