Bug 1285501 - Build linux/ directory on DragonFly, NetBSD and Solaris as well. r=jesup, a=sylvestre
authorJan Beich <jbeich@FreeBSD.org>
Fri, 08 Jul 2016 09:27:08 +0000
changeset 341991 aa52fb6664b5eead467e1b9d27ac8b52a05e9b55
parent 341990 c067813334d36db5117665c703f1732739987e76
child 341992 0454b9149d8ba0f14900dbd4e89b8f463c855fa2
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup, sylvestre
bugs1285501
milestone49.0a2
Bug 1285501 - Build linux/ directory on DragonFly, NetBSD and Solaris as well. r=jesup, a=sylvestre MozReview-Commit-ID: 46Z55h9oWIm
media/webrtc/trunk/build/filename_rules.gypi
--- a/media/webrtc/trunk/build/filename_rules.gypi
+++ b/media/webrtc/trunk/build/filename_rules.gypi
@@ -24,17 +24,17 @@
     ['(OS!="mac" and OS!="ios") or >(nacl_untrusted_build)==1', {
       'sources/': [ ['exclude', '\\.mm?$' ] ],
     }],
     # Do not exclude the linux files on *BSD since most of them can be
     # shared at this point.
     # In case a file is not needed, it is going to be excluded later on.
     # TODO(evan): the above is not correct; we shouldn't build _linux
     # files on non-linux.
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
         ['exclude', '(^|/)linux/'],
       ],
     }],
     ['OS!="android"', {
       'sources/': [
         ['exclude', '_android(_unittest)?\\.cc$'],
@@ -50,17 +50,17 @@
     ['<(chromeos)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [ ['exclude', '_chromeos(_unittest)?\\.(h|cc)$'] ]
     }],
     ['>(nacl_untrusted_build)==0', {
       'sources/': [
         ['exclude', '_nacl(_unittest)?\\.(h|cc)$'],
       ],
     }],
-    ['OS!="linux" and OS!="openbsd" and OS!="freebsd" or >(nacl_untrusted_build)==1', {
+    ['OS!="linux" and OS!="solaris" and <(os_bsd)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_xdg(_unittest)?\\.(h|cc)$'],
       ],
     }],
     ['<(use_x11)!=1 or >(nacl_untrusted_build)==1', {
       'sources/': [
         ['exclude', '_(x|x11)(_unittest)?\\.(h|cc)$'],
         ['exclude', '(^|/)x11_[^/]*\\.(h|cc)$'],