Reland of: Allow base to depend on allocator

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',
       'win_debug_Optimization': '0',
       # Run time checks are incompatible with any level of optimizations.
       'win_debug_RuntimeChecks': '0',
     },
   },
   'variables': {
     'tcmalloc_dir': '../../third_party/tcmalloc/chromium',
     'use_vtable_verify%': 0,
     # 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).
     'disable_debugallocation%': 0,
   },
   'targets': [
     # 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',
+      'variables': {
+        'conditions': [
+          ['use_allocator!="none" or win_use_allocator_shim==1', {
+            'allocator_target_type%': 'static_library',
+          }, {
+            'allocator_target_type%': 'none',
+          }],
+        ],
+      },
+      'type': '<(allocator_target_type)',

[Nico, 2016/01/20 17:37:00]

(if you want, you don't need a variable for this, you can just put the type in
the conditional below. but this is fine too)

[Primiano Tucci (use gerrit), 2016/01/20 17:42:33]

Hmm that was my first attempt but I got there a :
gyp: Missing 'type' field in target allocator

Dunno.

+      'toolsets': ['host', 'target'],

[Nico, 2016/01/20 17:37:00]

I think this will be fine since the xcode generator doesn't use toolsets

       'conditions': [
         ['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',
           ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'allocator_shim_win.cc',
           ],
+          'link_settings': {
+            'msvs_settings': {
+              'VCLinkerTool': {
+                'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
+                'AdditionalDependencies': [
+                  '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
+                ],
+              },
+            },
+          },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCCLCompilerTool': {
                   'RuntimeLibrary': '0',
                 },
               },
             },
           },
-          'direct_dependent_settings': {
-            'configurations': {
-              'Common_Base': {
-                'msvs_settings': {
-                  'VCLinkerTool': {
-                    'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
-                    'AdditionalDependencies': [
-                      '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
-                    ],
-                  },
-                },
-              },
-            },
-          },
         }],  # 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',
           ],
           # The order of this include_dirs matters, as tc-malloc has its own
@@ skipping 278 matching lines @@
           'target_conditions' : [
             ['_toolset=="target"', {
               'cflags!': [ '-finstrument-functions' ],
             }],
           ],
         }],
       ],  # conditions of 'allocator' target.
     },  # 'allocator' target.
   ],  # targets.
   'conditions': [
-    ['OS=="win" and component!="shared_library"', {
+    ['OS=="win" and win_use_allocator_shim==1', {
       'targets': [
         {
           'target_name': 'libcmt',
           'type': 'none',
           'actions': [
             {
               'action_name': 'libcmt',
               'inputs': [
                 'prep_libc.py',
               ],
               'outputs': [
                 '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib',
               ],
               'action': [
                 'python',
                 'prep_libc.py',
                 '$(VCInstallDir)lib',
                 '<(SHARED_INTERMEDIATE_DIR)/allocator',
                 '<(target_arch)',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }