DO NOT COMMIT - nacl allocator test CL

base/allocator/allocator.gyp

Index: base/allocator/allocator.gyp
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp
index d906eea0aace26f3f61e56a1331f5f7730d38642..8d241d1b8983bc2acf9ab1041cafdf36d012871a 100644
--- a/base/allocator/allocator.gyp
+++ b/base/allocator/allocator.gyp
@@ -49,25 +49,13 @@
               'AdditionalOptions': ['/ignore:4006'],
             },
           },
-          'dependencies': [
-            'libcmt',
-          ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'allocator_shim_win.cc',
+            'allocator_shim_win.h',
           ],
-          'link_settings': {
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'IgnoreDefaultLibraryNames': ['libcmtd.lib', 'libcmt.lib'],
-                'AdditionalDependencies': [
-                  '<(SHARED_INTERMEDIATE_DIR)/allocator/libcmt.lib'
-                ],
-              },
-            },
-          },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
@@ -393,33 +381,6 @@
     },  # 'allocator_features' target.
   ],  # targets.
   'conditions': [
-    ['OS=="win" and win_use_allocator_shim==1', {
-      'targets': [
-        {
-          'target_name': 'libcmt',
-          'toolsets': ['host', 'target'],
-          '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)',
-              ],
-            },
-          ],
-        },
-      ],
-    }],
     ['use_experimental_allocator_shim==1', {
       'targets': [
         {