Roll android_tools and breakpad to the latest.

This picks up in android_tools:
Updated SDK build tools to 21.0.1 and removed old versions.
Upgrade NDK to r10c.

And in breakpad:
Update breakpad to support Android NDK r10c
Fixing the Mac Inspector build by adding the launch_report dependency to the breakpadUtilities dylib project after it got pulled out from Inspector.mm.
Refactor .so name detection logic in minidump/linux_dumper.
The process uptime computation when the Windows out-of-process Crash Generation Server is used is done by subtracting the crashing process creation time from the current time when the crash is generated.
Linux multiprocess crash reporter: use pipe instead of socketpair in the client.
Remove workaround for Linux credential-passing bug.

TBR=brettw, danakj
NOTRY=true
BUG=424680, 425077, 358831

Review URL: https://codereview.chromium.org/671633003

Cr-Commit-Position: refs/heads/master@{#300671}

2 files changed, 9 insertions, 10 deletions

diff --git a/third_party/android_platform/README.chromium b/third_party/android_platform/README.chromium
index 54d4177..b67b8e3 100644
--- a/third_party/android_platform/README.chromium
+++ b/third_party/android_platform/README.chromium
@@ -20,3 +20,4 @@ When calling addr2line, check the symbol is a file (and not a directory).
 Added support for parsing LOG(FATAL) and DCHECK errors and their
     stack traces, as emitted by src/base/debug/stack_trace_android.cc
 Added support for finding symbols when library is loaded directly from the APK.
+Changed the toolchain to remove references to 4.6 toolchains.
\ No newline at end of file
diff --git a/third_party/android_platform/development/scripts/symbol.py b/third_party/android_platform/development/scripts/symbol.py
index 44d0238..d2a247d 100755
--- a/third_party/android_platform/development/scripts/symbol.py
+++ b/third_party/android_platform/development/scripts/symbol.py
@@ -53,7 +53,7 @@ def ToolPath(tool, toolchain_info=None):
   # 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":
@@ -61,15 +61,15 @@ def ToolPath(tool, toolchain_info=None):
     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:
@@ -97,26 +97,24 @@ def FindToolchain():
     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")
     ]