allocator cleanup: remove deprecated windows tc-malloc bits

base/allocator/allocator.gyp

 # Copyright (c) 2012 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.
 
 {
   'target_defaults': {
     'variables': {
       # This code gets run a lot and debugged rarely, so it should be fast
       # by default. See http://crbug.com/388949.
       'debug_optimize': '2',
@@ skipping 14 matching lines @@
     # Only executables and not libraries should depend on the
     # allocator target; only the application (the final executable)
     # knows what allocator makes sense.
     {
       'target_name': 'allocator',
       # TODO(primiano): This should be type: none for the noop cases (an empty
       # static lib can confuse some gyp generators). Fix it once the refactoring
       # (crbug.com/564618) bring this file to a saner state (fewer conditions).
       'type': 'static_library',
       'conditions': [
-        # TODO(primiano): in next CL this should check win_use_allocator_shim.
-        # Right now that would produce a non-zero ninja diff for asan=1.
-        ['OS=="win" and component!="shared_library"', {
+        ['OS=="win" and win_use_allocator_shim==1', {
           'msvs_settings': {
             # TODO(sgk):  merge this with build/common.gypi settings
             'VCLibrarianTool': {
               'AdditionalOptions': ['/ignore:4006,4221'],
             },
             'VCLinkerTool': {
               'AdditionalOptions': ['/ignore:4006'],
             },
           },
           'dependencies': [
             'libcmt',
-
-            # TODO(primiano): remove in next CL, not really needed.
-            '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
           ],
           'include_dirs': [
-            '.',  # TODO(primiano): remove in next CL, not really needed.
             '../..',
           ],
           'sources': [
             'allocator_shim_win.cc',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'RuntimeLibrary': '0',
                 },
               },
-              # TODO(primiano): remove this 'conditions' section soon. This is
-              # only for tc-malloc, which is not supported on windows. The only
-              # reason os it is to make the initial refactoring easier and
-              # a zero-diff ninja w.r.t. the current situation.
-              'conditions': [
-                ['disable_debugallocation==0', {
-                  'defines': [ 'TCMALLOC_FOR_DEBUGALLOCATION' ],
-                }],
-              ],
             },
           },
           'direct_dependent_settings': {
             'configurations': {
               'Common_Base': {
                 'msvs_settings': {
                   'VCLinkerTool': {
                     'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
                     'AdditionalDependencies': [
                       '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
                     ],
                   },
                 },
               },
             },
-            'defines': [
-              'PERFTOOLS_DLL_DECL=',
-            ],
           },
         }],  # OS=="win"
         ['use_allocator=="tcmalloc"', {
           # Disable the heap checker in tcmalloc.
           'defines': [
             'NO_HEAP_CHECK',
           ],
           'dependencies': [
             '../third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
           ],
@@ skipping 328 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }