[Android] Roll the NDK to r11c.

Also rolls breakpad to pick up an NDK fix.

BUG=599327

Review-Url: https://codereview.chromium.org/1991343002
Cr-Commit-Position: refs/heads/master@{#397885}

DEPS

@@ -114,7 +114,7 @@ allowed_hosts = [
 
 deps = {
   'src/breakpad/src':
-   Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '5aac5eabb0fd7cbd3bf7805fb922fe2f90e80155',
+   Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '8573429523f71677a57bd89a89235a3ab9aa4fbd',
 
   'src/buildtools':
    Var('chromium_git') + '/chromium/buildtools.git' + '@' +  Var('buildtools_revision'),
@@ -435,7 +435,7 @@ deps_os = {
      Var('chromium_git') + '/external/android_protobuf.git' + '@' + '999188d0dc72e97f7fe08bb756958a2cf090f4e7',
 
     'src/third_party/android_tools':
-     Var('chromium_git') + '/android_tools.git' + '@' + '5b5f2f60b78198eaef25d442ac60f823142a8a6e',
+     Var('chromium_git') + '/android_tools.git' + '@' + '04c2c06fe3ef3d93343feb6e83cd932725740d7f',
 
     'src/third_party/apache-mime4j':
      Var('chromium_git') + '/chromium/deps/apache-mime4j.git' + '@' + '28cb1108bff4b6cf0a2e86ff58b3d025934ebe3a',
@@ -505,6 +505,7 @@ deps_os = {
   },
 }
 
+recursedeps = [ 'src/third_party/android_tools' ]
 
 include_rules = [
   # Everybody can use some things.

build/common.gypi

@@ -1726,6 +1726,8 @@
             # in the GYP files.
             'android_ndk_absolute_root%': '<!(cd <(DEPTH) && pwd -P)/third_party/android_tools/ndk/',
             'android_host_arch%': '<!(uname -m)',
+            # Version of the NDK. Used to ensure full rebuilds on NDK rolls.
+            'android_ndk_version%': 'r11c',
             # Android API-level of the SDK used for compilation.
             'android_sdk_version%': '23',
             'android_sdk_build_tools_version%': '23.0.1',
@@ -1749,6 +1751,7 @@
           # Copy conditionally-set variables out one scope.
           'android_ndk_root%': '<(android_ndk_root)',
           'android_ndk_absolute_root%': '<(android_ndk_absolute_root)',
+          'android_ndk_version%': '<(android_ndk_version)',
           'android_sdk_root%': '<(android_sdk_root)',
           'android_sdk_version%': '<(android_sdk_version)',
           'android_sdk_build_tools_version%': '<(android_sdk_build_tools_version)',
@@ -1820,6 +1823,7 @@
         'android_gdbserver%': '<(android_gdbserver)',
         'android_ndk_root%': '<(android_ndk_root)',
         'android_ndk_sysroot%': '<(android_ndk_sysroot)',
+        'android_ndk_version%': '<(android_ndk_version)',
         'android_sdk_root%': '<(android_sdk_root)',
         'android_sdk_version%': '<(android_sdk_version)',
         'android_toolchain%': '<(android_toolchain)',
@@ -4869,6 +4873,7 @@
               # The NDK has these things, but doesn't define the constants
               # to say that it does. Define them here instead.
               'HAVE_SYS_UIO_H',
+              'ANDROID_NDK_VERSION=<(android_ndk_version)',
             ],
             'ldflags!': [
               '-pthread',  # Not supported by Android toolchain.

build/config/android/BUILD.gn

@@ -21,6 +21,9 @@ config("compiler") {
     # The NDK has these things, but doesn't define the constants to say that it
     # does. Define them here instead.
     "HAVE_SYS_UIO_H",
+
+    # Forces full rebuilds on NDK rolls.
+    "ANDROID_NDK_VERSION=${android_ndk_version}",
   ]
 
   if (is_clang) {

build/config/android/config.gni

@@ -23,6 +23,7 @@ if (is_android) {
 
   if (!defined(default_android_ndk_root)) {
     default_android_ndk_root = "//third_party/android_tools/ndk"
+    default_android_ndk_version = "r11c"
   }
 
   if (!defined(default_android_sdk_root)) {
@@ -56,6 +57,7 @@ if (is_android) {
 
   declare_args() {
     android_ndk_root = default_android_ndk_root
+    android_ndk_version = default_android_ndk_version
 
     android_sdk_root = default_android_sdk_root
     android_sdk_version = default_android_sdk_version