Chromium Code Reviews| Index: base/base.gypi |
| diff --git a/base/base.gypi b/base/base.gypi |
| index 578e50d1c8c465b155cb5c76300407cf8d438241..9199ab48fdf6e5e501d8576dc6fc069564b321ab 100644 |
| --- a/base/base.gypi |
| +++ b/base/base.gypi |
| @@ -354,7 +354,7 @@ |
| '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks', |
| ], |
| 'conditions': [ |
| - [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', { |
| + [ 'os_posix!=1 or OS=="mac"', { |
|
tony
2011/05/10 17:16:28
Nit: I would make this OS=="win" or OS=="mac".
|
| 'sources/': [ |
| ['exclude', '^nix/'], |
| ], |
| @@ -406,12 +406,12 @@ |
| 'string16.cc', |
| ], |
| },], |
| - ['OS=="freebsd" or OS=="openbsd"', { |
| + ['os_posix==1 and OS!="linux" and OS!="mac"', { |
| 'sources!': [ |
| - 'base/files/file_path_watcher_linux.cc', |
| + 'files/file_path_watcher_linux.cc', |
| ], |
| 'sources': [ |
| - 'base/files/file_path_watcher_stub.cc', |
| + 'files/file_path_watcher_stub.cc', |
| ], |
| }], |
| ], |
| @@ -442,7 +442,7 @@ |
| ], |
| }, |
| 'conditions': [ |
| - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { |
| + [ 'toolkit_gtk==1', { |
|
tony
2011/05/10 17:16:28
This would become toolkit_uses_gtk.
|
| 'conditions': [ |
| [ 'chromeos==1', { |
| 'sources/': [ ['include', '_chromeos\\.cc$'] ] |
| @@ -477,13 +477,16 @@ |
| '../build/linux/system.gyp:gtk', |
| '../build/linux/system.gyp:x11', |
| ], |
| - }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" |
| + }, { # toolkit_gtk!=1 |
| 'sources/': [ |
| ['exclude', '/xdg_user_dirs/'], |
| ['exclude', '_nss\.cc$'], |
| ], |
| }], |
| [ 'OS == "freebsd" or OS == "openbsd"', { |
| + 'sources!': [ |
| + 'process_linux.cc', |
|
Mark Mentovai
2011/05/10 14:20:27
Ideally, _linux files wouldn’t be built if OS!="li
|
| + ], |
| 'link_settings': { |
| 'libraries': [ |
| '-L/usr/local/lib -lexecinfo', |
| @@ -627,7 +630,7 @@ |
| }, |
| ], |
| }], |
| - [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { |
| + [ 'os_posix==1 and OS!="mac"', { |
| 'targets': [ |
| { |
| 'target_name': 'symbolize', |