Revert of Reland of: Allow base to depend on allocator

base/allocator/allocator.gyp

Index: base/allocator/allocator.gyp
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index 69ba35d5fad74d9cda37f88154c315a409809371..45a95bbdc2669a0dafdd9fa9caaf0f050d7b921b 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -27,17 +27,10 @@
     # knows what allocator makes sense.
     {
       'target_name': 'allocator',
-      'variables': {
-        'conditions': [
-          ['use_allocator!="none" or win_use_allocator_shim==1', {
-            'allocator_target_type%': 'static_library',
-          }, {
-            'allocator_target_type%': 'none',
-          }],
-        ],
-      },
-      'type': '<(allocator_target_type)',
-      'toolsets': ['host', 'target'],
+      # 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': [
         ['OS=="win" and win_use_allocator_shim==1', {
           'msvs_settings': {
@@ -58,21 +51,25 @@
           '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'
+                    ],
+                  },
                 },
               },
             },
@@ -375,7 +372,7 @@
     },  # 'allocator' target.
   ],  # targets.
   'conditions': [
-    ['OS=="win" and win_use_allocator_shim==1', {
+    ['OS=="win" and component!="shared_library"', {
       'targets': [
         {
           'target_name': 'libcmt',