[counting_allocator] Chrome changes.

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 105 matching lines @@
   cflags_cc += [
     "-isystem" + libcxx_include_path,
     "-isystem" + libcxxabi_include_path,
     "-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 += [
+  libs = [
     "c++abi",
     "android_support",
   ]
 
+  if (false) {
+    # 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" ]
+    }
+  }
+
   # arm builds of libc++ starting in NDK r12 depend on unwind.
   if (current_cpu == "arm") {
     libs += [ "unwind" ]
   }
 
   # 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",
@@ skipping 78 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") {
 }