Roll buildtools fee7f1e849..2f04b1cc1e

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")
 
 declare_args() {
   # Provide a way to force disable debugallocation in Debug builds,
   # e.g. for profiling (it's more rare to profile Debug builds,
@@ skipping 41 matching lines @@
 
 # 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") ]
+    libs = [ "$target_gen_dir/allocator/libcmt.lib" ]
   }
 
   if (!is_component_build) {
     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,
 
         # The environment file in the build directory. This is required because
         # the Windows toolchain setup saves the VC paths and such so that
         # running "mc.exe" will work with the configured toolchain. This file
         # is in the root build dir.
         "environment.$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" ]
+      public_deps = [
+        ":prep_libc",
+      ]
       deps = [
-        ":prep_libc",
         "//base",
       ]
     }
   }
 }
 
 if (use_allocator == "tcmalloc") {
   # tcmalloc currently won't compile on Android.
   # TODO(crbug.com/559766) this should be a source_set but
   # there are static initializers that get accidentally linked
@@ skipping 164 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" ]
   }
 }  # !is_android