diff options
| author | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 22:42:46 +0000 |
|---|---|---|
| committer | rvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-04 22:42:46 +0000 |
| commit | 167d52bbfbfc80f2232474eddfeb8bc587008d71 (patch) | |
| tree | 9e77fbdef399cdc76b6bf8ca5531b950a76f4210 /base/base.gypi | |
| parent | 573251378096bd1cfec87cc485fb1261c129ce2a (diff) | |
| download | chromium_src-167d52bbfbfc80f2232474eddfeb8bc587008d71.zip chromium_src-167d52bbfbfc80f2232474eddfeb8bc587008d71.tar.gz chromium_src-167d52bbfbfc80f2232474eddfeb8bc587008d71.tar.bz2 | |
Create a base_static library with files that should not
be used from a dll (base.dll), and fix some incorrect
dependencies.
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6759047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/base/base.gypi b/base/base.gypi index e4d10ff..3c41a39 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', @@ -310,17 +308,15 @@ 'version.h', 'vlog.cc', 'vlog.h', - 'win/i18n.cc', - 'win/i18n.h', - 'win/object_watcher.cc', - 'win/object_watcher.h', - 'win/pe_image.cc', 'win/event_trace_consumer.h', 'win/event_trace_controller.cc', 'win/event_trace_controller.h', 'win/event_trace_provider.cc', 'win/event_trace_provider.h', - 'win/pe_image.h', + 'win/i18n.cc', + 'win/i18n.h', + 'win/object_watcher.cc', + 'win/object_watcher.h', 'win/registry.cc', 'win/registry.h', 'win/scoped_bstr.cc', @@ -418,6 +414,7 @@ 'base_target': 1, }, 'dependencies': [ + 'base_static', '../third_party/modp_b64/modp_b64.gyp:modp_b64', 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', ], @@ -538,7 +535,6 @@ 'crypto/capi_util.cc', 'event_recorder.cc', 'file_version_info.cc', - 'pe_image.cc', 'registry.cc', 'resource_util.cc', 'win_util.cc', @@ -685,6 +681,7 @@ '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 |