Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1042)

Unified Diff: base/base.gypi

Issue 7053033: Base: cleanup for base.dll. Move base_switches back to the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | base/base_switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
===================================================================
--- base/base.gypi (revision 86746)
+++ base/base.gypi (working copy)
@@ -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"', {
« no previous file with comments | « base/base.gyp ('k') | base/base_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698