Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: build/android/adb_gdb

Issue 1555783002: Never auto-detect the output directory in adb_gdb (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@adb_gdb-new-flag
Patch Set: review comments Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/adb_gdb
diff --git a/build/android/adb_gdb b/build/android/adb_gdb
index 2e2f90ab972a6bfa5b4488d5365c6a9f3266abf2..7ea512280a61a9dad576d0c9d3a0e717e40312fb 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").
- --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
+ else
+ panic "Please specify an output directory by 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,')
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698