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

third_party/android_platform/development/scripts/symbol.py

 #!/usr/bin/python
 #
 # Copyright (C) 2013 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 283 matching lines @@
   logging.debug('MapDeviceApkToLibrary: matching_apks=%s' % matching_apks)
   for matching_apk in matching_apks:
     crazy_lib = GetCrazyLib(matching_apk)
     if crazy_lib:
       return crazy_lib
 
 def GetLibrarySearchPaths():
   if CHROME_SYMBOLS_DIR:
     return [CHROME_SYMBOLS_DIR]
   dirs = _GetChromeOutputDirCandidates()
-  return PathListJoin(dirs, ['lib.unstripped', 'lib', 'lib.target', '.'])
+  # GYP places unstripped libraries under out/$BUILDTYPE/lib
+  # GN places them under out/$BUILDTYPE/lib.unstripped
+  return PathListJoin(dirs, ['lib.unstripped', 'lib', '.'])
 
 def GetCandidateLibraries(library_name):
   """Returns a list of candidate library filenames.
 
   Args:
     library_name: basename of the library to match.
 
   Returns:
     A list of matching library filenames for library_name.
   """
@@ skipping 291 matching lines @@
   process.stdin.write("\n")
   process.stdin.close()
   demangled_symbol = process.stdout.readline().strip()
   process.stdout.close()
   return demangled_symbol
 
 def FormatSymbolWithOffset(symbol, offset):
   if offset == 0:
     return symbol
   return "%s+%d" % (symbol, offset)