Simplify adb_gdb to accept only --output-directory / CHROMIUM_OUTPUT_DIR

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
@@ skipping 66 matching lines @@
 # in the --help output.
 #
 DEFAULT_ACTIVITY=${ADB_GDB_ACTIVITY:-".Main"}
 
 # Allow wrapper scripts to set the program name through ADB_GDB_PROGNAME
 PROGNAME=${ADB_GDB_PROGNAME:-$(basename "$0")}
 
 ACTIVITY=$DEFAULT_ACTIVITY
 ADB=
 ANNOTATE=
-# Note: Ignore BUILDTYPE variable, because the Ninja build doesn't use it.
-BUILDTYPE=
 FORCE=
 GDBEXEPOSTFIX=gdb
 GDBINIT=
 GDBSERVER=
 HELP=
 NDK_DIR=
 NO_PULL_LIBS=
 PACKAGE_NAME=
 PID=
 PORT=
@@ skipping 85 matching lines @@
       ;;
     --su-prefix=*)
       SU_PREFIX=$optarg
       ;;
     --symbol-dir=*)
       SYMBOL_DIR=$optarg
       ;;
     --output-directory=*)
       CHROMIUM_OUTPUT_DIR=$optarg
       ;;
-    --out-dir=*)
-      CHROMIUM_OUT_DIR=$optarg
-      ;;
     --target-arch=*)
       TARGET_ARCH=$optarg
       ;;
     --toolchain=*)
       TOOLCHAIN=$optarg
       ;;
     --ui)
       GDBEXEPOSTFIX=gdbtui
       ;;
     --verbose)
       VERBOSE=$(( $VERBOSE + 1 ))
       ;;
-    --debug)
-      BUILDTYPE=Debug
-      ;;
-    --release)
-      BUILDTYPE=Release
-      ;;
     -*)
       panic "Unknown option $opt, see --help." >&2
       ;;
     *)
       if [ "$PACKAGE_NAME" ]; then
         panic "You can only provide a single package name as argument!\
  See --help."
       fi
       PACKAGE_NAME=$opt
       ;;
@@ skipping 37 matching lines @@
 
 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>/lib/                (used by GYP builds)
   \$CHROMIUM_SRC/<out>/lib.unstripped/     (used by GN builds)
 
-Where <out> is 'out' is determined by CHROMIUM_OUT_DIR, CHROMIUM_OUTPUT_DIR, or
-the --out-dir, --output-directory flags.
+Where <out> is determined by CHROMIUM_OUTPUT_DIR, or --output-directory.
 
-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.
+You can set the path manually via --symbol-dir.
 
 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.
 
 An alternative to --gdb=<file> is to use --toollchain=<path> to specify
 the path to the host target-specific cross-toolchain.
@@ skipping 20 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 (e.g. "out").
   --output-directory=<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.
   --attach-delay=<num>  Seconds to wait for gdbserver to attach to the
                         remote process before starting gdb. Default 1.
@@ skipping 11 matching lines @@
 
   --su-prefix=<prefix>  Prepend <prefix> to 'adb shell' commands that are
                         run by this script. This can be useful to use
                         the 'su' program on rooted production devices.
                         e.g. --su-prefix="su -c"
 
   --pull-libs           Force system libraries extraction.
   --no-pull-libs        Do not extract any system library.
   --libs-dir=<path>     Specify system libraries extraction directory.
 
-  --debug               Use libraries under out/Debug.
-  --release             Use libraries under out/Release.
-
 EOF
   exit 0
 fi
 
 if [ -z "$PACKAGE_NAME" ]; then
   panic "Please specify a package name on the command line. See --help."
 fi
 
-if [[ -z "$CHROMIUM_OUTPUT_DIR" && -z "$CHROMIUM_OUT_DIR" ]]; then
+if [[ -z "$CHROMIUM_OUTPUT_DIR" ]]; then

[watk, 2016/02/09 01:04:06]

Could you change this to require either --symbol-dir or CHROMIUM_OUTPUT_DIR?
I've been setting --symbol-dir because I don't want any of the magic, but with
the change before this one, you need --output-directory as well as --symbol-dir
even  though --output-directory is redundant.

   if [[ -e "build.ninja" ]]; then
     CHROMIUM_OUTPUT_DIR=$(pwd)
   else
     panic "Please specify an output directory using one of:
        --output-directory=out/Debug
-       --out-dir=out/
        CHROMIUM_OUTPUT_DIR=out/Debug
-       CHROMIUM_OUT_DIR=out
        Setting working directory to an output directory.
        See --help."
    fi
 fi
 
 if [ -z "$NDK_DIR" ]; then
   ANDROID_NDK_ROOT=$(PYTHONPATH=$CHROMIUM_SRC/build/android python -c \
 'from pylib.constants import ANDROID_NDK_ROOT; print ANDROID_NDK_ROOT,')
 else
   if [ ! -d "$NDK_DIR" ]; then
@@ skipping 330 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
-# (in order of priority):
-# 1. $CHROMIUM_OUTPUT_DIR
-# 2. $CHROMIUM_SRC/$CHROMIUM_OUT_DIR/$BUILDTYPE (if $BUILDTYPE is set)
-# 3. $CHROMIUM_SRC/$CHROMIUM_OUT_DIR/{Debug,Release}
+# $CHROMIUM_OUTPUT_DIR.
 #
 # Out: nothing, but this sets SYMBOL_DIR
 #
 detect_symbol_dir () {
-  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 [[ -n "$CHROMIUM_OUTPUT_DIR" ]]; then
-    PARENT_DIR="$CHROMIUM_OUTPUT_DIR"
-    SUBDIRS="lib.unstripped lib"
-  else
-    PARENT_DIR="$CHROMIUM_OUT_DIR"
-    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
+  # GYP places unstripped libraries under out/lib
+  # GN places them under out/lib.unstripped
+  local PARENT_DIR="$CHROMIUM_OUTPUT_DIR"
   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="$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"
+  SYMBOL_DIR="$PARENT_DIR/lib.unstripped"
+  if [[ -z "$(ls "$SYMBOL_DIR"/lib*.so 2>/dev/null)" ]]; then
+    SYMBOL_DIR="$PARENT_DIR/lib"
+    if [[ -z "$(ls "$SYMBOL_DIR"/lib*.so 2>/dev/null)" ]]; then
+      panic "Could not find any symbols under \
+$PARENT_DIR/lib{.unstripped}. Please build the program first!"
     fi
-  done
-  SUBDIR=$(cat $LIST | sort -r | head -1 | cut -d" " -f2)
-  rm -f "$LIST"
-
-  if [[ -z "$SUBDIR" ]]; then
-    panic "Could not find any build directory under \
-$PARENT_DIR/{${SUBDIRS// /,}}. Please build the program first!"
   fi
-
-  SYMBOL_DIR=$PARENT_DIR/$SUBDIR
   log "Auto-config: --symbol-dir=$SYMBOL_DIR"
 }
 
 if [ -z "$SYMBOL_DIR" ]; then
   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
@@ skipping 289 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"