Reland of: Allow base to depend on 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")
 import("//build/config/compiler/compiler.gni")
 
 if (is_win) {
   import("//build/config/win/visual_studio_version.gni")
 }
 
 declare_args() {
   # Provide a way to force disable debugallocation in Debug builds,
   # e.g. for profiling (it's more rare to profile Debug builds,
   # but people sometimes need to do that).
   enable_debugallocation = is_debug
 }
 
-# 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") {
-    public_deps += [ ":tcmalloc" ]
-  }
+  if (!is_nacl) {
+    deps = []
 
-  # This condition expresses the win_use_allocator_shim in the GYP build.
-  if (is_win && !is_component_build && visual_studio_version != "2015") {
-    public_deps += [ ":allocator_shim" ]
-  }
+    if (use_allocator == "tcmalloc") {
+      deps += [ ":tcmalloc" ]
+    }
+
+    # This condition expresses the win_use_allocator_shim in the GYP build.
+    if (is_win && !is_component_build && visual_studio_version != "2015") {
+      deps += [ ":allocator_shim" ]
+      all_dependent_configs = [ ":nocmt" ]
+    }
+  }  # !is_nacl
 }
 
 # 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 && visual_studio_version != "2015") {
@@ skipping 57 matching lines @@
       ]
     }
 
     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",
-        "//base",
       ]
     }
   }
 }
 
 if (use_allocator == "tcmalloc") {
   # tcmalloc currently won't compile on Android.
   source_set("tcmalloc") {
     tcmalloc_dir = "//third_party/tcmalloc/chromium"
 
@@ skipping 159 matching lines @@
     # Make sure the allocation library is optimized as much as possible when
     # we"re in release mode.
     if (!is_debug) {
       configs -= [ "//build/config/compiler:default_optimization" ]
       configs += [ "//build/config/compiler:optimize_max" ]
     }
 
     deps += [ "//base/third_party/dynamic_annotations" ]
   }
 }  # use_allocator == "tcmalloc"