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

main project.

BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/7053033

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86899 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 26 insertions, 27 deletions

diff --git a/base/base.gyp b/base/base.gyp
index 8c3dfce..629e23f 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -62,8 +62,6 @@
       'target_name': 'base_static',
       'type': 'static_library',
       'sources': [
-        'base_switches.cc',
-        'base_switches.h',
         'win/pe_image.cc',
         'win/pe_image.h',
       ],
@@ -77,8 +75,6 @@
       'target_name': 'base_static_win64',
       'type': 'static_library',
       'sources': [
-        'base_switches.cc',
-        'base_switches.h',
         'win/pe_image.cc',
         'win/pe_image.h',
       ],
diff --git a/base/base.gypi b/base/base.gypi
index 49e931a..36e609e 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -34,6 +34,8 @@
           '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',
@@ -434,13 +436,9 @@
         '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': {
@@ -520,18 +518,21 @@
             ],
           },
         }],
-        [ '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': ['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',
+          ],
         },],
         [ 'component=="shared_library"', {
           'defines': [
             'BASE_DLL',
-            'BASE_IMPLEMENTATION=1',
+            'BASE_IMPLEMENTATION',
           ],
           'conditions': [
             ['OS=="win"', {
diff --git a/base/base_switches.h b/base/base_switches.h
index c261b4a..3c70117 100644
--- a/base/base_switches.h
+++ b/base/base_switches.h
@@ -8,19 +8,21 @@
 #define BASE_BASE_SWITCHES_H_
 #pragma once
 
+#include "base/base_api.h"
+
 namespace switches {
 
-extern const char kDebugOnStart[];
-extern const char kDisableBreakpad[];
-extern const char kEnableDCHECK[];
-extern const char kFullMemoryCrashReport[];
-extern const char kLocalePak[];
-extern const char kNoErrorDialogs[];
-extern const char kNoMessageBox[];
-extern const char kTestChildProcess[];
-extern const char kV[];
-extern const char kVModule[];
-extern const char kWaitForDebugger[];
+BASE_API extern const char kDebugOnStart[];
+BASE_API extern const char kDisableBreakpad[];
+BASE_API extern const char kEnableDCHECK[];
+BASE_API extern const char kFullMemoryCrashReport[];
+BASE_API extern const char kLocalePak[];
+BASE_API extern const char kNoErrorDialogs[];
+BASE_API extern const char kNoMessageBox[];
+BASE_API extern const char kTestChildProcess[];
+BASE_API extern const char kV[];
+BASE_API extern const char kVModule[];
+BASE_API extern const char kWaitForDebugger[];
 
 }  // namespace switches