Roll src/third_party/android_tools/ cb6bc2110..023e2f654 (1 commit).

build/config/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 assert(is_android)
 
 # This is included by reference in the //build/config/compiler config that
 # is applied to all targets. It is here to separate out the logic that is
 # Android-only.
 config("compiler") {
   cflags = [
     "-ffunction-sections",
     "-fno-short-enums",
   ]
   defines = [
     "ANDROID",
 
     # 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}",
+    # Forces full rebuilds on NDK rolls. To rebuild everything when NDK version
+    # stays the same, increment the suffix number.
+    "ANDROID_NDK_VERSION_ROLL=${android_ndk_version}_1",
   ]
 
   if (is_clang) {
     if (current_cpu == "mips64el") {
       cflags += [
         # Have to force IAS for mips64.
         "-fintegrated-as",
       ]
     }
   } else {
@@ skipping 191 matching lines @@
 
       # Avoid errors with current NDK:
       # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
       "-finstrument-functions-exclude-file-list=arm_neon.h",
     ]
   }
 }
 
 config("no_cygprofile_instrumentation") {
 }