Make no-tcmalloc (really, non-base/allocator) builds work again,...

chrome/chrome.gyp

 # Copyright (c) 2009 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.
 
 {
   'variables': {
     'chromium_code': 1,
 
     'variables': {
       'version_py_path': 'tools/build/version.py',
@@ skipping 1051 matching lines @@
           'dependencies': [
             '../build/linux/system.gyp:gtk',
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
         # Windows-specific rules.
         ['OS=="win"', {
           'include_dirs': [
             'third_party/wtl/include',
           ],
-          'dependencies': [
-            '<(allocator_target)',
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+              'export_dependent_settings': [
+                '<(allocator_target)',
+              ],
+            }],
           ],
-          'export_dependent_settings': [
-            '<(allocator_target)',
-          ],
-        },],
+        }],
       ],
     },
     {
       'target_name': 'utility',
       'type': '<(library)',
       'msvs_guid': '4D2B38E6-65FF-4F97-B88A-E441DF54EBF7',
       'dependencies': [
         '../base/base.gyp:base',
         '../skia/skia.gyp:skia',
       ],
@@ skipping 1652 matching lines @@
       { 'targets': [
         {
           # TODO(sgk):  remove this when we change the buildbots to
           # use the generated build\all.sln file to build the world.
           'target_name': 'pull_in_all',
           'type': 'none',
           'dependencies': [
             'installer/mini_installer.gyp:*',
             'installer/installer.gyp:*',
             '../app/app.gyp:*',
-            '../base/allocator/allocator.gyp:*',
             '../base/base.gyp:*',
             '../ipc/ipc.gyp:*',
             '../media/media.gyp:*',
             '../net/net.gyp:*',
             '../printing/printing.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sdch/sdch.gyp:*',
             '../skia/skia.gyp:*',
             '../testing/gmock.gyp:*',
             '../testing/gtest.gyp:*',
@@ skipping 19 matching lines @@
 
             '../breakpad/breakpad.gyp:*',
             '../courgette/courgette.gyp:*',
             '../gears/gears.gyp:*',
             '../rlz/rlz.gyp:*',
             '../sandbox/sandbox.gyp:*',
             '../tools/memory_watcher/memory_watcher.gyp:*',
             '../v8/tools/gyp/v8.gyp:v8_shell',
           ],
           'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '../base/allocator/allocator.gyp:*',
+              ],
+            }],
             ['chrome_frame_define==1', {
               'dependencies': [
                 '../chrome_frame/chrome_frame.gyp:*',
               ],
             }],
           ],
         },
         {
           'target_name': 'chrome_dll_version',
           'type': 'none',
@@ skipping 114 matching lines @@
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'tools/profiles/generate_profile.cc',
             'tools/profiles/thumbnail-inl.h',
           ],
           'conditions': [
             ['OS=="win"', {
-              'dependencies': [
-                '<(allocator_target)',
+              'conditions': [
+                ['win_use_allocator_shim==1', {
+                  'dependencies': [
+                    '<(allocator_target)',
+                  ],
+                }],
               ],
               'configurations': {
                 'Debug': {
                   'msvs_settings': {
                     'VCLinkerTool': {
                       'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                     },
                   },
                 },
               },
             }],
           ],
         },
       ]},  # 'targets'
     ],  # OS=="win"
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: