Reland roll android_tools and breakpad to the latest.

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 35 matching lines @@
     return "darwin-ppc"
   if uname == "Linux":
     return "linux-x86"
   return uname
 
 def ToolPath(tool, toolchain_info=None):
   """Return a full qualified path to the specified tool"""
   # ToolPath looks for the tools in the completely incorrect directory.
   # This looks in the checked in android_tools.
   if ARCH == "arm":
-    toolchain_source = "arm-linux-androideabi-4.6"
+    toolchain_source = "arm-linux-androideabi-4.9"
     toolchain_prefix = "arm-linux-androideabi"
     ndk = "ndk"
   elif ARCH == "arm64":
     toolchain_source = "aarch64-linux-android-4.9"
     toolchain_prefix = "aarch64-linux-android"
     ndk = "ndk"
   elif ARCH == "x86":
-    toolchain_source = "x86-4.6"
-    toolchain_prefix = "i686-android-linux"
+    toolchain_source = "x86-4.9"
+    toolchain_prefix = "i686-linux-android"
     ndk = "ndk"
   elif ARCH == "x86_64":
     toolchain_source = "x86_64-4.9"
     toolchain_prefix = "x86_64-linux-android"
     ndk = "ndk"
   elif ARCH == "mips":
-    toolchain_source = "mipsel-linux-android-4.6"
+    toolchain_source = "mipsel-linux-android-4.9"
     toolchain_prefix = "mipsel-linux-android"
     ndk = "ndk"
   else:
     raise Exception("Could not find tool chain")
 
   toolchain_subdir = (
       "third_party/android_tools/%s/toolchains/%s/prebuilt/linux-x86_64/bin" %
        (ndk, toolchain_source))
 
   return os.path.join(CHROME_SRC,
                       toolchain_subdir,
                       toolchain_prefix + "-" + tool)
 
 def FindToolchain():
   """Look for the latest available toolchain
 
   Args:
     None
 
   Returns:
     A pair of strings containing toolchain label and target prefix.
   """
   global TOOLCHAIN_INFO
   if TOOLCHAIN_INFO is not None:
     return TOOLCHAIN_INFO
 
   ## Known toolchains, newer ones in the front.
+  gcc_version = "4.9"
   if ARCH == "arm64":
-    gcc_version = "4.9"
     known_toolchains = [
       ("aarch64-linux-android-" + gcc_version, "aarch64", "aarch64-linux-android")
     ]
   elif ARCH == "arm":
-    gcc_version = "4.6"
     known_toolchains = [
-      ("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi"),
+      ("arm-linux-androideabi-" + gcc_version, "arm", "arm-linux-androideabi")
     ]
   elif ARCH =="x86":
     known_toolchains = [
-      ("i686-android-linux-4.4.3", "x86", "i686-android-linux")
+      ("x86-" + gcc_version, "x86", "i686-linux-android")
     ]
   elif ARCH =="x86_64":
     known_toolchains = [
-      ("x86_64-linux-android-4.9", "x86_64", "x86_64-linux-android")
+      ("x86_64-" + gcc_version, "x86_64", "x86_64-linux-android")
     ]
   elif ARCH == "mips":
-    gcc_version = "4.6"
     known_toolchains = [
       ("mipsel-linux-android-" + gcc_version, "mips", "mipsel-linux-android")
     ]
   else:
     known_toolchains = []
 
   # Look for addr2line to check for valid toolchain path.
   for (label, platform, target) in known_toolchains:
     toolchain_info = (label, platform, target);
     if os.path.exists(ToolPath("addr2line", toolchain_info)):
@@ skipping 438 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)