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..69f45257678add796b2b35ae68b275190d444fd9 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',
-        'task_queue_win.cc',
         'template_util.h',
         'thread_annotations.h',
         'thread_checker.h',
@@ -121,17 +117,26 @@
           'dependencies': [
             '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
           ],
+        }],
+        ['enable_libevent==1', {
+          'sources': [
+            'task_queue_libevent.cc',
+            'task_queue_posix.cc',

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

I don't like putting the posix file in two places but the alternative is much
worse IMO: then we need to put a super complex condition for it as a separate
condition ("if not linux and android and libevent not enabled: then add the
file"). It's clearer what's going on now at least.

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

That's fine with me, simplicity is key. It's still way easier to read than the
previous excluding version.

+          ],
         }, {
-          'sources!': [ 'task_queue_libevent.cc' ],
+          # If not libevent, fall back to the old task queues.

[tommi, 2016/05/16 14:35:04]

s/old/other

           'conditions': [
-            ['OS=="linux" or OS=="android"', {
-              'sources!': [ 'task_queue_posix.cc' ],
+            ['OS=="mac" or OS=="ios"', {
+             'sources': [
+               'task_queue_gcd.cc',
+               'task_queue_posix.cc',
+             ],
             }],
+            ['OS=="win"', {
+              'sources': [ 'task_queue_win.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': {