Separate building and enabling libevent.

webrtc/base/base.gyp

Index: webrtc/base/base.gyp
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 4564504aabf01390c1a12829b73a7145b53f0744..d24bedb49db800ecc5f16db63198bf047780664b 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -84,11 +84,7 @@
         'systeminfo.cc',
         'systeminfo.h',
         'task_queue.h',
-        'task_queue_libevent.cc',
-        'task_queue_gcd.cc',
-        'task_queue_posix.cc',
         'task_queue_posix.h',

[kjellander_webrtc, 2016/05/16 13:26:13]

Move 'task_queue.h' and 'task_queue_posix.h' into the enable_libevent==1
condition since they're only used by those sources.

[tommi, 2016/05/16 13:28:55]

the posix file is also needed for mac.

[phoglund, 2016/05/16 14:18:45]

Yeah, look at the new patch set. I think we should leave the .h files in there
to save some duplication.

[kjellander_webrtc, 2016/05/16 14:27:05]

Fair enough.

-        'task_queue_win.cc',
         'template_util.h',
         'thread_annotations.h',
         'thread_checker.h',
@@ -121,17 +117,21 @@
           'dependencies': [
             '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
           ],
-        }, {
-          'sources!': [ 'task_queue_libevent.cc' ],
+        }],
+        ['enable_libevent==1', {
+          'sources': [ 'task_queue_libevent.cc' ],
           'conditions': [
             ['OS=="linux" or OS=="android"', {
-              'sources!': [ 'task_queue_posix.cc' ],
+              'sources': [ 'task_queue_posix.cc' ],
+            }],
+            ['OS=="win"', {
+              'sources': [ 'task_queue_win.cc' ],
+            }],
+            ['OS!="linux" and OS!="android" and OS!="win"', {

[phoglund, 2016/05/16 13:18:01]

I thought this was cleaner than nesting 'conditions'. This one needs to be the
else block for both conditions above.

[phoglund, 2016/05/16 13:18:27]

Also this should translate cleanly to GN.

+              'sources': [ 'task_queue_gcd.cc' ],
             }],
           ],
         }],
-        ['build_libevent==1 or OS=="linux" or OS=="android" or OS=="win"', {
-          'sources!': [ 'task_queue_gcd.cc' ],
-        }],
         ['OS=="mac" and build_with_chromium==0', {
           'all_dependent_settings': {
             'xcode_settings': {