Revert "Add COMPONENT_BUILD global define. "

base/base.gypi

 # Copyright (c) 2011 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': {
       'base_target': 0,
     },
     'target_conditions': [
@@ skipping 517 matching lines @@
         [ 'OS != "win"', {
             'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
             'sources!': [
               'third_party/purify/pure_api.c',
               'event_recorder.cc',
               'resource_util.cc',
             ],
         },],
         [ 'component=="shared_library"', {
           'defines': [
+            'BASE_DLL',
             'BASE_IMPLEMENTATION',
           ],
           'conditions': [
             ['OS=="win"', {
+              'msvs_disabled_warnings': [
+                4251,
+              ],
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
+              'direct_dependent_settings': {
+                'defines': [
+                  'BASE_DLL',
+                ],
+                'msvs_disabled_warnings': [
+                  4251,
+                ],
+              },
             }],
           ],
         }],
       ],
       'sources': [
         'third_party/nspr/prcpucfg.h',
         'third_party/nspr/prcpucfg_win.h',
         'third_party/nspr/prtypes.h',
         'third_party/purify/pure.h',
         'third_party/purify/pure_api.c',
@@ skipping 31 matching lines @@
         'time_mac.cc',
         'time_posix.cc',
       ],
     },
   ],
   'conditions': [
     [ 'OS == "win"', {
       'targets': [
         {
           'target_name': 'base_nacl_win64',
-          'type': '<(component)',
+          'type': 'static_library',
           'variables': {
             'base_target': 1,
           },
           'dependencies': [
             'base_static_win64',
             'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations_win64',
           ],
           # TODO(gregoryd): direct_dependent_settings should be shared with the
           # 32-bit target, but it doesn't work due to a bug in gyp
           'direct_dependent_settings': {
             'include_dirs': [
               '..',
             ],
           },
           'defines': [
             '<@(nacl_win64_defines)',
           ],
           'sources': [
             'i18n/icu_util_nacl_win64.cc',
           ],
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
-          'conditions': [
-            [ 'component == "shared_library"', {
-              'defines': [
-                'BASE_IMPLEMENTATION',
-              ],
-              'sources!': [
-                'debug/debug_on_start_win.cc',
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'base_i18n_nacl_win64',
-          'type': 'static_library',
-          # TODO(gregoryd): direct_dependent_settings should be shared with the
-          # 32-bit target, but it doesn't work due to a bug in gyp
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '..',
-            ],
-          },
-          'defines': [
-            '<@(nacl_win64_defines)',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'i18n/icu_util_nacl_win64.cc',
-          ],
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
         },
       ],
     }],
     [ 'os_posix==1 and OS!="mac"', {
       'targets': [
         {
           'target_name': 'symbolize',
           'type': 'static_library',
           'variables': {
             'chromium_code': 0,
@@ skipping 42 matching lines @@
             'third_party/xdg_mime/xdgmimemagic.c',
             'third_party/xdg_mime/xdgmimemagic.h',
             'third_party/xdg_mime/xdgmimeparent.c',
             'third_party/xdg_mime/xdgmimeparent.h',
           ],
         },
       ],
     }],
   ],
 }