Never auto-detect the output directory in adb_gdb

build/android/adb_gdb

Index: build/android/adb_gdb
diff --git a/build/android/adb_gdb b/build/android/adb_gdb
index 2e2f90ab972a6bfa5b4488d5365c6a9f3266abf2..b1c32b6d242fff53f8438ed8d43570a5389a6fd0 100755
--- a/build/android/adb_gdb
+++ b/build/android/adb_gdb
@@ -188,7 +188,7 @@ for opt; do
     --symbol-dir=*)
       SYMBOL_DIR=$optarg
       ;;
-    --output-dir=*)
+    --output-directory=*)
       CHROMIUM_OUTPUT_DIR=$optarg
       ;;
     --out-dir=*)
@@ -270,7 +270,7 @@ shared libraries under one of the following directories:
   \$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-dir flags.
+the --out-dir, --output-directory 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.
@@ -315,7 +315,7 @@ Valid options:
   --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").

[pasko, 2016/02/04 12:57:39]

why do we support out-dir here and not in other scripts? Wouldn't consistency be
better?

[agrieve, 2016/02/04 16:20:22]

Removed in https://codereview.chromium.org/1659413003/.

I think it's just tied to the old ways of specifying output dir and --release /
--debug separately rather than just pointing directly to output-directory.

-  --output-dir=<path>   Specify the output directory (e.g. "out/Debug").
+  --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.
@@ -357,6 +357,20 @@ 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 [[ -e "build.ninja" ]]; then
+    CHROMIUM_OUTPUT_DIR=$(pwd)

[pasko, 2016/02/04 12:57:39]

please use "$PWD" instead
it is faster than running a command, has quotes

[agrieve, 2016/02/04 16:20:22]

Done.

+  else
+    panic "Please specify an output directory using one of:

[pasko, 2016/02/04 12:57:39]

nit: s/using/by using/

[agrieve, 2016/02/04 16:20:23]

Done.

+       --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,')