Remove lib.target from search paths in adb_gdb and symbol.py

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 251 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 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.
 
 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.
@@ skipping 417 matching lines @@
 
 # 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/
 #
 # $1: $BUILDTYPE value, can be empty
 # Out: nothing, but this sets SYMBOL_DIR
 #
 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
   printf "" > "$LIST"
   for SUBDIR in $SUBDIRS; do
     DIR=$CHROMIUM_SRC/$CHROMIUM_OUT_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)
@@ skipping 320 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"