From 79bd5f12620f81dd241984d925b87a888e1dc37b Mon Sep 17 00:00:00 2001
From: fdegans <fdegans@chromium.org>
Date: Wed, 22 Oct 2014 05:58:21 -0700
Subject: [PATCH] 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}
---
 DEPS                                                   |  4 ++--
 base/sys_info_android.cc                               |  3 +--
 build/android/pylib/constants.py                       |  2 +-
 build/common.gypi                                      |  8 ++++----
 build/config/android/config.gni                        |  2 +-
 build/get_landmines.py                                 |  1 +
 third_party/android_platform/README.chromium           |  1 +
 .../android_platform/development/scripts/symbol.py     | 18 ++++++++----------
 8 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/DEPS b/DEPS
index 3809c9dd3b4b..4dbc8ca4016b 100644
--- a/DEPS
+++ b/DEPS
@@ -109,7 +109,7 @@ allowed_hosts = [
 
 deps = {
   'src/breakpad/src':
-   Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'e15ba2c4d7d3b10c8c2818aa14ab66ad9a383ff6', # from svn revision 1388
+   Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + '6eff9c9cbb15a431e16f98c9179858a8c1aea6cf', # from svn revision 1396
 
   'src/buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
@@ -453,7 +453,7 @@ deps_os = {
      Var('chromium_git') + '/external/android_webview_glue.git' + '@' + '7d62eab4ca242beacac4471c002e998ef5c218b8',
 
     'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + '36bf7ac9a608f95f642ec64a743feea3b2e5a8d5',
+     Var('chromium_git') + '/android_tools.git' + '@' + 'ea50cccc11657404ce22cf928062ed1a3927eb39',
 
     'src/third_party/apache-mime4j':
      Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
diff --git a/base/sys_info_android.cc b/base/sys_info_android.cc
index ab760e557972..0d885ee019ac 100644
--- a/base/sys_info_android.cc
+++ b/base/sys_info_android.cc
@@ -15,8 +15,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info_internal.h"
 
-// TODO(rmcilroy): Update API level when 'L' gets an official API level.
-#if (__ANDROID_API__ >= 9999 /* 'L' */)
+#if (__ANDROID_API__ >= 21 /* 5.0 - Lollipop */)
 
 namespace {
 
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index d32494698c24..331efc1c8c91 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -147,7 +147,7 @@ DEVICE_PERF_OUTPUT_DIR = (
 SCREENSHOTS_DIR = os.path.join(DIR_SOURCE_ROOT, 'out_screenshots')
 
 ANDROID_SDK_VERSION = 21
-ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.0'
+ANDROID_SDK_BUILD_TOOLS_VERSION = '21.0.1'
 ANDROID_SDK_ROOT = os.path.join(DIR_SOURCE_ROOT,
                                 'third_party/android_tools/sdk')
 ANDROID_SDK_TOOLS = os.path.join(ANDROID_SDK_ROOT,
diff --git a/build/common.gypi b/build/common.gypi
index 0ad62ee597ca..e7b86cf66277 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1635,7 +1635,7 @@
             'android_host_arch%': '<!(uname -m)',
             # Android API-level of the SDK used for compilation.
             'android_sdk_version%': '21',
-            'android_sdk_build_tools_version%': '21.0.0',
+            'android_sdk_build_tools_version%': '21.0.1',
             'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')",
           },
           # Copy conditionally-set variables out one scope.
@@ -1663,7 +1663,7 @@
             ['target_arch == "x64"', {
               'android_app_abi%': 'x86_64',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-x86_64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-x86_64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-x86_64',
               'android_ndk_lib_dir%': 'usr/lib64',
               'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
@@ -1683,7 +1683,7 @@
             ['target_arch == "arm64"', {
               'android_app_abi%': 'arm64-v8a',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-arm64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-arm64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-arm64',
               'android_ndk_lib_dir%': 'usr/lib',
               'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
             }],
@@ -1697,7 +1697,7 @@
             ['target_arch == "mips64el"', {
               'android_app_abi%': 'mips64',
               'android_gdbserver%': '<(android_ndk_root)/prebuilt/android-mips64/gdbserver/gdbserver',
-              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-L/arch-mips64',
+              'android_ndk_sysroot%': '<(android_ndk_root)/platforms/android-21/arch-mips64',
               'android_ndk_lib_dir%': 'usr/lib64',
               'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-linux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin',
               'gcc_version%': 49,
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index d002ba29a285..e76d1bc5c24b 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -68,7 +68,7 @@ if (is_android) {
   android_sdk = "${android_sdk_root}/platforms/android-${android_sdk_version}"
 
   android_sdk_tools = "${android_sdk_root}/tools"
-  android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.0"
+  android_sdk_build_tools = "${android_sdk_root}/build-tools/21.0.1"
 
   # Path to the SDK's android.jar
   android_sdk_jar = "$android_sdk/android.jar"
diff --git a/build/get_landmines.py b/build/get_landmines.py
index f15d8dbd28b4..ddbb7876b5c4 100755
--- a/build/get_landmines.py
+++ b/build/get_landmines.py
@@ -59,6 +59,7 @@ def print_landmines():
   if platform() == 'android':
     print 'Clobber: To delete stale generated .java files.'
     print 'Delete stale generated .java files again. crbug.com/349592'
+    print 'Clobber to delete incompatible object binary format with NDK r10c'
 
 
 def main():
diff --git a/third_party/android_platform/README.chromium b/third_party/android_platform/README.chromium
index 54d41774e3ec..b67b8e3bd988 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 44d023839132..d2a247da97ad 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")
     ]
-- 
2.11.4.GIT