diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 22:44:52 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-24 22:44:52 +0000 |
| commit | aff1e883843eb3dd5367b2bc312e7f30397f526b (patch) | |
| tree | 56cf8350c0be48d2e7eb9969cbbf594a989de200 /base | |
| parent | 532532845be28265b628e63cae9da3435699c9e1 (diff) | |
| download | chromium_src-aff1e883843eb3dd5367b2bc312e7f30397f526b.zip chromium_src-aff1e883843eb3dd5367b2bc312e7f30397f526b.tar.gz chromium_src-aff1e883843eb3dd5367b2bc312e7f30397f526b.tar.bz2 | |
Revert 86486 - Base: cleanup for base.dll. Move base_switches back to the
main project.
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/7055016
TBR=rvargas@google.com
Review URL: http://codereview.chromium.org/7064042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gyp | 4 | ||||
| -rw-r--r-- | base/base.gypi | 7 | ||||
| -rw-r--r-- | base/base_switches.h | 24 |
3 files changed, 19 insertions, 16 deletions
diff --git a/base/base.gyp b/base/base.gyp index 0c6ee30..60d0a28 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -62,6 +62,8 @@ 'target_name': 'base_static', 'type': 'static_library', 'sources': [ + 'base_switches.cc', + 'base_switches.h', 'win/pe_image.cc', 'win/pe_image.h', ], @@ -75,6 +77,8 @@ '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 22d66f8..c31809e 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -34,8 +34,6 @@ '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', @@ -442,6 +440,9 @@ '../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': { @@ -537,7 +538,7 @@ [ 'component=="shared_library"', { 'defines': [ 'BASE_DLL', - 'BASE_IMPLEMENTATION', + 'BASE_IMPLEMENTATION=1', ], 'conditions': [ ['OS=="win"', { diff --git a/base/base_switches.h b/base/base_switches.h index 3c70117..c261b4a 100644 --- a/base/base_switches.h +++ b/base/base_switches.h @@ -8,21 +8,19 @@ #define BASE_BASE_SWITCHES_H_ #pragma once -#include "base/base_api.h" - namespace switches { -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[]; +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[]; } // namespace switches |