Index: base/base.gypi |
diff --git a/base/base.gypi b/base/base.gypi |
index 51f50ed4163b4adc214e0a3f6fb085fe368e1f28..63618758cb31d1564bd04074a8bb08d59327171d 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', { |
'sources/': [ |
['exclude', '^nix/'], |
], |
@@ -407,12 +407,12 @@ |
'debug/trace_event.cc', |
], |
},], |
- ['OS=="freebsd" or OS=="openbsd"', { |
+ ['os_posix==1 and OS!="linux"', { |
'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', |
], |
}], |
], |
@@ -443,7 +443,7 @@ |
], |
}, |
'conditions': [ |
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { |
+ [ 'os_posix==1', { |
'conditions': [ |
[ 'chromeos==1', { |
'sources/': [ ['include', '_chromeos\\.cc$'] ] |
@@ -478,13 +478,16 @@ |
'../build/linux/system.gyp:gtk', |
'../build/linux/system.gyp:x11', |
], |
- }, { # OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris" |
+ }, { # os_posix!=1 |
'sources/': [ |
['exclude', '/xdg_user_dirs/'], |
['exclude', '_nss\.cc$'], |
], |
}], |
[ 'OS == "freebsd" or OS == "openbsd"', { |
+ 'sources!': [ |
+ 'process_linux.cc', |
+ ], |
'link_settings': { |
'libraries': [ |
'-L/usr/local/lib -lexecinfo', |
@@ -628,7 +631,7 @@ |
}, |
], |
}], |
- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', { |
+ [ 'os_posix==1', { |
'targets': [ |
{ |
'target_name': 'symbolize', |