[Android] Roll to NDK r12b.

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
@@ skipping 96 matching lines @@
     "-isystem" +
         rebase_path("$android_ndk_root/sources/android/support/include",
                     root_build_dir),
   ]
 
   defines = [ "__GNU_SOURCE=1" ]  # Necessary for clone().
   ldflags = [ "-nostdlib" ]
   lib_dirs = [ android_libcpp_lib_dir ]
 
   # The libc++ runtime library (must come first).
-  # ASan needs to dynamically link to libc++ even in static builds so
-  # that it can interpose operator new.
-  if (is_component_build || is_asan) {
-    libs = [ "c++_shared" ]
-  } else {
-    libs = [ "c++_static" ]
-  }
+  libs = [ "c++" ]

[agrieve, 2016/09/03 00:22:01]

curious why this is safe to change?

[jbudorick, 2016/09/03 18:41:01]

Turns out it isn't :(

r12 seems to have split the contents of libc++_static.a and libc++_shared.so,
and it brought in
https://chromium.googlesource.com/android_ndk/+/master/sources/cxx-stl/llvm-l...
and
https://chromium.googlesource.com/android_ndk/+/master/sources/cxx-stl/llvm-l...
to support that. I was hoping to use those (and was able to successfully build
with them), but doing this meant that -lc++ always dynamically linked libc++.so
(even in non-component builds).

 
   # Manually link the libgcc.a that the cross compiler uses. This is
   # absolute because the linker will look inside the sysroot if it's not.
   libs += [
     rebase_path(android_libgcc_file),
     "c",
   ]
 
   # Clang with libc++ does not require an explicit atomic library reference.
   if (!is_clang) {
@@ skipping 54 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") {
 }