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

Unified Diff: base/base.gypi

Issue 6904109: linux: components support for base/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 8 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/atomicops_internals_x86_gcc.h ('k') | base/base_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/base.gypi
diff --git a/base/base.gypi b/base/base.gypi
index 58089e9190dba0ad52faab62224c24433b40f3e9..58622dd68a958ef347d4a2eab739262506cc010e 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -528,25 +528,29 @@
'win_util.cc',
],
},],
- [ 'OS=="win" and component=="shared_library"', {
+ [ 'component=="shared_library"', {
'defines': [
'BASE_DLL',
'BASE_IMPLEMENTATION=1',
],
- 'msvs_disabled_warnings': [
- 4251,
- ],
- 'sources!': [
- 'debug/debug_on_start_win.cc',
+ 'conditions': [
+ ['OS=="win"', {
+ 'msvs_disabled_warnings': [
+ 4251,
+ ],
+ 'sources!': [
+ 'debug/debug_on_start_win.cc',
+ ],
+ 'direct_dependent_settings': {
+ 'defines': [
+ 'BASE_DLL',
+ ],
+ 'msvs_disabled_warnings': [
+ 4251,
+ ],
+ },
+ }],
],
- 'direct_dependent_settings': {
- 'defines': [
- 'BASE_DLL',
- ],
- 'msvs_disabled_warnings': [
- 4251,
- ],
- },
}],
],
'sources': [
« no previous file with comments | « base/atomicops_internals_x86_gcc.h ('k') | base/base_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698