Work on Windows GN allocator.

base/allocator/BUILD.gn

 # Copyright (c) 2013 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/allocator.gni")
 
 # Only executables and not libraries should depend on the allocator target;
 # only the application (the final executable) knows what allocator makes sense.
 # This "allocator" meta-target will forward to the default allocator according
 # to the build settings.
 group("allocator") {
+  public_deps = []
   if (use_allocator == "tcmalloc") {
-    deps = [
-      ":tcmalloc",
-    ]
+    public_deps += [ ":tcmalloc" ]
+  }
+
+  # This condition expresses the win_use_allocator_shim in the GYP build.
+  if (is_win && !is_component_build) {
+    public_deps += [ ":allocator_shim" ]
   }
 }
 
+# This config defines ALLOCATOR_SHIM in the same conditions that the allocator
+# shim will be used by the allocator target.
+#
+# TODO(brettw) this is only used in one place and is kind of mess, because it
+# assumes that the library using it will eventually be linked with
+# //base/allocator in the default way. Clean this up and delete this.
+config("allocator_shim_define") {
+  if (is_win && !is_component_build) {
+    defines = [ "ALLOCATOR_SHIM" ]
+  }
+}
+
 # This config and libc modification are only used on Windows.
 if (is_win) {
   import("//build/config/win/visual_studio_version.gni")
 
   config("nocmt") {
     ldflags = [
       "/NODEFAULTLIB:libcmt",
       "/NODEFAULTLIB:libcmtd",
     ]
     libs = [ rebase_path("$target_gen_dir/allocator/libcmt.lib") ]
   }
 
   action("prep_libc") {
     script = "prep_libc.py"
     outputs = [
       "$target_gen_dir/allocator/libcmt.lib",
     ]
     args = [
       visual_studio_path + "/vc/lib",
       rebase_path("$target_gen_dir/allocator"),
       current_cpu,
     ]
   }
+
+  source_set("allocator_shim") {
+    sources = [
+      "allocator_shim_win.cc",
+    ]
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
+
+    public_configs = [ ":nocmt" ]
+    deps = [
+      ":prep_libc",
+    ]
+  }
 }
 
 if (use_allocator == "tcmalloc") {
   # tcmalloc currently won't compile on Android.
   source_set("tcmalloc") {
     tcmalloc_dir = "//third_party/tcmalloc/chromium"
 
     # Don't check tcmalloc's includes. These files include various files like
     # base/foo.h and they actually refer to tcmalloc's forked copy of base
     # rather than the regular one, which confuses the header checker.
@@ skipping 90 matching lines @@
       "$tcmalloc_dir/src/symbolize.h",
       "$tcmalloc_dir/src/system-alloc.cc",
       "$tcmalloc_dir/src/system-alloc.h",
 
       # #included by debugallocation_shim.cc
       #"$tcmalloc_dir/src/tcmalloc.cc",
       "$tcmalloc_dir/src/thread_cache.cc",
       "$tcmalloc_dir/src/thread_cache.h",
       "$tcmalloc_dir/src/windows/port.cc",
       "$tcmalloc_dir/src/windows/port.h",
-      "allocator_shim.cc",
       "debugallocation_shim.cc",
 
       # These are both #included by allocator_shim for maximal linking.
       #"generic_allocators.cc",
       #"win_allocator.cc",
     ]
 
     # Disable the heap checker in tcmalloc.
     defines = [ "NO_HEAP_CHECK" ]
 
@@ skipping 15 matching lines @@
         "$tcmalloc_dir/src/base/linuxthreads.cc",
         "$tcmalloc_dir/src/base/linuxthreads.h",
         "$tcmalloc_dir/src/base/vdso_support.cc",
         "$tcmalloc_dir/src/base/vdso_support.h",
         "$tcmalloc_dir/src/maybe_threads.cc",
         "$tcmalloc_dir/src/maybe_threads.h",
         "$tcmalloc_dir/src/symbolize.h",
         "$tcmalloc_dir/src/system-alloc.cc",
         "$tcmalloc_dir/src/system-alloc.h",
 
-        # included by allocator_shim.cc
-        "debugallocation_shim.cc",
-
         # cpuprofiler
         "$tcmalloc_dir/src/base/thread_lister.c",
         "$tcmalloc_dir/src/base/thread_lister.h",
         "$tcmalloc_dir/src/profile-handler.cc",
         "$tcmalloc_dir/src/profile-handler.h",
         "$tcmalloc_dir/src/profiledata.cc",
         "$tcmalloc_dir/src/profiledata.h",
         "$tcmalloc_dir/src/profiler.cc",
       ]
       defines += [ "PERFTOOLS_DLL_DECL=" ]
 
       configs -= [
         # Tcmalloc defines this itself, and we don't want duplicate definition
         # warnings.
         "//build/config/win:nominmax",
       ]
 
       public_configs = [ ":nocmt" ]
 
       deps += [ ":prep_libc" ]
     }
 
     if (is_linux || is_android) {
       sources -= [
         "$tcmalloc_dir/src/system-alloc.h",
         "$tcmalloc_dir/src/windows/port.cc",
         "$tcmalloc_dir/src/windows/port.h",
-
-        # TODO(willchan): Support allocator shim later on.
-        "allocator_shim.cc",
       ]
 
       # We enable all warnings by default, but upstream disables a few.
       # Keep "-Wno-*" flags in sync with upstream by comparing against:
       # http://code.google.com/p/google-perftools/source/browse/trunk/Makefile.am
       cflags = [
         "-Wno-sign-compare",
         "-Wno-unused-result",
       ]
 
@@ skipping 30 matching lines @@
   visibility = [ "//base/*" ]
   sources = [
     "allocator_extension_thunks.cc",
     "allocator_extension_thunks.h",
   ]
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 }