Revert 86899 - Base: cleanup for base.dll. Move base_switches back to the

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 16 matching lines @@
           'atomicops_internals_x86_gcc.cc',
           'atomicops_internals_x86_msvc.h',
           'base_api.h',
           'base_paths.cc',
           'base_paths.h',
           'base_paths_mac.h',
           'base_paths_mac.mm',
           'base_paths_linux.cc',
           'base_paths_win.cc',
           'base_paths_win.h',
-          'base_switches.cc',
-          'base_switches.h',
           'basictypes.h',
           'bind.h',
           'bind_helpers.h',
           'bind_internal.h',
           'bind_internal_win.h',
           'bits.h',
           'callback.h',
           'callback_internal.cc',
           'callback_internal.h',
           'callback_old.h',
@@ skipping 380 matching lines @@
   },
   'targets': [
     {
       'target_name': 'base',
       'type': '<(component)',
       'msvs_guid': '1832A374-8A74-4F9E-B536-69A699B3E165',
       'variables': {
         'base_target': 1,
       },
       'dependencies': [
+        'base_static',
         '../third_party/modp_b64/modp_b64.gyp:modp_b64',
         'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
+      'export_dependent_settings': [
+        'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+      ],
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       #  64-bit target, but it doesn't work due to a bug in gyp
       'direct_dependent_settings': {
         'include_dirs': [
           '..',
         ],
       },
       'conditions': [
         [ 'toolkit_uses_gtk==1', {
           'conditions': [
@@ skipping 59 matching lines @@
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/AppKit.framework',
               '$(SDKROOT)/System/Library/Frameworks/Carbon.framework',
               '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
               '$(SDKROOT)/System/Library/Frameworks/IOKit.framework',
               '$(SDKROOT)/System/Library/Frameworks/Security.framework',
             ],
           },
         }],
-        [ 'OS == "win"', {
-          'dependencies': ['base_static'],
-        },
-        {  # else OS != WIN
-          'dependencies': ['../third_party/libevent/libevent.gyp:libevent'],
-          'sources!': [
-            'third_party/purify/pure_api.c',
-            'event_recorder.cc',
-            'resource_util.cc',
-          ],
+        [ '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',
+            'BASE_IMPLEMENTATION=1',
           ],
           'conditions': [
             ['OS=="win"', {
               'msvs_disabled_warnings': [
                 4251,
               ],
               'sources!': [
                 'debug/debug_on_start_win.cc',
               ],
               'direct_dependent_settings': {
@@ skipping 136 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',
           ],
         },
       ],
     }],
   ],
 }