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

Unified Diff: build/android/adb_gdb

Issue 1551993003: Remove lib.target from search paths in adb_gdb and symbol.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 | third_party/android_platform/development/scripts/symbol.py » ('j') | 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 01b539d3f154e9ea09a62a0b5e705365fad78e10..361f1bf8c523c5e86be8ab8e3fcc281b728a9fbe 100755
--- a/build/android/adb_gdb
+++ b/build/android/adb_gdb
@@ -269,10 +269,10 @@ 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 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)
Where <out> is 'out' by default, unless the --out=<name> option is used or
the CHROMIUM_OUT_DIR environment variable is defined.
@@ -710,13 +710,12 @@ get_file_timestamp () {
#
detect_symbol_dir () {
local SUBDIRS SUBDIR LIST DIR DIR_LIBS TSTAMP
- # Make places them under out/$BUILDTYPE/lib.target.
- # GYP places debug libraries under out/$BUILDTYPE/lib
+ # GYP places unstripped libraries under out/$BUILDTYPE/lib
# GN places them under out/$BUILDTYPE/lib.unstripped
if [ "$1" ]; then
- SUBDIRS="$1/lib $1/lib.target $1/lib.unstripped"
+ SUBDIRS="$1/lib $1/lib.unstripped"
else
- SUBDIRS="Release/lib Debug/lib Release/lib.target Debug/lib.target"
+ SUBDIRS="Release/lib Debug/lib"
SUBDIRS+=" Release/lib.unstripped Debug/lib.unstripped"
fi
LIST=$TMPDIR/scan-subdirs-$$.txt
« no previous file with comments | « no previous file | third_party/android_platform/development/scripts/symbol.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698