Add --output-dir, CHROMIUM_OUTPUT_DIR to adb_gdb

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")
 
 # Force locale to C to allow recognizing output from subprocesses.
 LC_ALL=C
 
 # Location of Chromium-top-level sources.
 CHROMIUM_SRC=$(cd "$PROGDIR"/../.. >/dev/null && 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=
 COMMAND_PREFIX=
 
 clean_exit () {
   if [ "$TMPDIR" ]; then
     GDBSERVER_PID=$(cat $GDBSERVER_PIDFILE 2>/dev/null)
     if [ "$GDBSERVER_PID" ]; then
       log "Killing background gdbserver process: $GDBSERVER_PID"
@@ skipping 143 matching lines @@
       ;;
     --start)
       START=true
       ;;
     --su-prefix=*)
       SU_PREFIX=$optarg
       ;;
     --symbol-dir=*)
       SYMBOL_DIR=$optarg
       ;;
+    --output-dir=*)
+      CHROMIUM_OUTPUT_DIR=$optarg
+      ;;
     --out-dir=*)
       CHROMIUM_OUT_DIR=$optarg
       ;;
     --target-arch=*)
       TARGET_ARCH=$optarg
       ;;
     --toolchain=*)
       TOOLCHAIN=$optarg
       ;;
     --ui)
@@ skipping 14 matching lines @@
     *)
       if [ "$PACKAGE_NAME" ]; then
         panic "You can only provide a single package name as argument!\
  See --help."
       fi
       PACKAGE_NAME=$opt
       ;;
   esac
 done
 
-print_help_options () {
-  cat <<EOF
-EOF
-}
-
 if [ "$HELP" ]; then
   if [ "$ADB_GDB_PROGNAME" ]; then
     # Assume wrapper scripts all provide a default package name.
     cat <<EOF
 Usage: $PROGNAME [options]
 
 Attach gdb to a running Android $PROGRAM_NAME process.
 EOF
   else
     # Assume this is a direct call to adb_gdb
@@ skipping 21 matching lines @@
    - target gdbserver binary
    - host gdb client (e.g. arm-linux-androideabi-gdb)
    - directory with symbolic version of $PROGRAM_NAME's shared libraries.
 
 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 GYP builds)
-  \$CHROMIUM_SRC/<out>/Debug/lib/               (used by GYP builds)
-  \$CHROMIUM_SRC/<out>/Release/lib.unstripped/  (used by GN builds)
-  \$CHROMIUM_SRC/<out>/Debug/lib.unstripped/    (used by GN builds)
+  \$CHROMIUM_SRC/<out>/lib/                (used by GYP builds)
+  \$CHROMIUM_SRC/<out>/lib.unstripped/     (used by GN builds)
 
-Where <out> is 'out' by default, unless the --out=<name> option is used or
-the CHROMIUM_OUT_DIR environment variable is defined.
+Where <out> is 'out' is determined by CHROMIUM_OUT_DIR, CHROMIUM_OUTPUT_DIR, or
+the --out-dir, --output-dir flags.
 
 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 target device,
 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.
+  --out-dir=<path>      Specify the out directory (e.g. "out").
+  --output-dir=<path>   Specify the output directory (e.g. "out/Debug").
   --package-name=<name> Specify package name (alternative to 1st argument).
   --privileged          Debug first privileged process we find.
   --privileged=<num>    Debug specific privileged process.
   --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.
@@ skipping 363 matching lines @@
 
 # Return the timestamp of a given file, 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/$CHROMIUM_OUT_DIR/
+# $CHROMIUM_SRC/$CHROMIUM_OUT_DIR/, or $CHROMIUM_OUTPUT_DIR if set.
 #

[pasko, 2016/01/07 16:11:38]

plz mention using $BUILDTYPE as input

[agrieve, 2016/01/08 02:07:30]

Done.

-# $1: $BUILDTYPE value, can be empty
 # Out: nothing, but this sets SYMBOL_DIR
 #
 detect_symbol_dir () {
-  local SUBDIRS SUBDIR LIST DIR DIR_LIBS TSTAMP
+  local PARENT_DIR SUBDIRS SUBDIR LIST DIR DIR_LIBS TSTAMP
   # GYP places unstripped libraries under out/$BUILDTYPE/lib
   # GN places them under out/$BUILDTYPE/lib.unstripped
-  if [ "$1" ]; then
-    SUBDIRS="$1/lib $1/lib.unstripped"
+  if [[ -n "$CHROMIUM_OUTPUT_DIR" ]]; then
+    PARENT_DIR="$CHROMIUM_OUTPUT_DIR"
+    SUBDIRS="lib.unstripped lib"
   else
-    SUBDIRS="Release/lib Debug/lib"
-    SUBDIRS+=" Release/lib.unstripped Debug/lib.unstripped"
+    PARENT_DIR="${CHROMIUM_OUT_DIR}"

[pasko, 2016/01/07 16:11:38]

please remove curly braces for consistency

[agrieve, 2016/01/08 02:07:30]

Done.

+    if [[ -n "$BUILDTYPE" ]]; then
+      PARENT_DIR="$PARENT_DIR/$BUILDTYPE"
+      SUBDIRS="lib.unstripped lib"
+    else
+      SUBDIRS="Release/lib.unstripped Debug/lib.unstripped "
+      SUBDIRS+="Release/lib Debug/lib"
+    fi
+  fi
+  if [[ ! -e "$PARENT_DIR" ]]; then
+    PARENT_DIR="$CHROMIUM_SRC/$PARENT_DIR"
   fi
   LIST=$TMPDIR/scan-subdirs-$$.txt
   printf "" > "$LIST"
   for SUBDIR in $SUBDIRS; do
-    DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$SUBDIR
+    DIR="$PARENT_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/$CHROMIUM_OUT_DIR. Please build the program first!"
-    else
-      panic "Could not find any $1 directory under \
-$CHROMIUM_SRC/$CHROMIUM_OUT_DIR. Check your build type!"
-    fi
+    panic "Could not find any build directory under \

[pasko, 2016/01/07 16:11:38]

passing 2 params looks nicer:

if [[ -z "$SUBDIR" ]]; then
  panic "Could not find any build directory under" \
      "$PARENT_DIR/{${SUBDIRS/ /,}}. Please build the program first!"
fi

[agrieve, 2016/01/08 02:07:30]

Done.

+$PARENT_DIR/{${SUBDIRS/ /,}}. Please build the program first!"

[pasko, 2016/01/07 16:11:38]

${SUBDIRS/ /,} would only replace the first space with comma, is that
intentional?

[agrieve, 2016/01/08 02:07:30]

Nope! Fixed.

   fi
 
-  SYMBOL_DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$SUBDIR
+  SYMBOL_DIR=$PARENT_DIR/$SUBDIR
   log "Auto-config: --symbol-dir=$SYMBOL_DIR"
 }
 
 if [ -z "$SYMBOL_DIR" ]; then
-  detect_symbol_dir "$BUILDTYPE"
+  detect_symbol_dir
 fi
 
 # Allow several concurrent debugging sessions
 TARGET_GDBSERVER=/data/data/$PACKAGE_NAME/gdbserver-adb-gdb-$TMP_ID
 TMP_TARGET_GDBSERVER=/data/local/tmp/gdbserver-adb-gdb-$TMP_ID
 
 # Return the build fingerprint contained in a build.prop file.
 # $1: path to build.prop file
 get_build_fingerprint_from () {
   cat "$1" | grep -e '^ro.build.fingerprint=' | cut -d= -f2
@@ skipping 283 matching lines @@
 
 if [ "$VERBOSE" -gt 0 ]; then
   echo "### START $COMMANDS"
   cat $COMMANDS
   echo "### END $COMMANDS"
 fi
 
 log "Launching gdb client: $GDB $GDB_ARGS -x $COMMANDS"
 $GDB $GDB_ARGS -x $COMMANDS &&
 rm -f "$GDBSERVER_PIDFILE"