Do not build task_queue.cc and include from webrtc_overrides in Chrome.

webrtc/base/base.gyp

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 {
   'includes': [ '../build/common.gypi', ],
@@ skipping 123 matching lines @@
     {
       'target_name': 'rtc_task_queue',
       'type': 'static_library',
       'dependencies': [
         'rtc_base_approved',
       ],
       'sources': [
         'sequenced_task_checker.h',
         'sequenced_task_checker_impl.cc',
         'sequenced_task_checker_impl.h',
-        'task_queue.h',
-        'task_queue_posix.h',
       ],
       'conditions': [
-        ['build_libevent==1', {
-          'dependencies': [
-            '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
+        ['build_with_chromium==1', {
+          'include_dirs': [
+            '../../webrtc_overrides'
           ],
-        }],
-        ['enable_libevent==1', {
-          'sources': [
-            'task_queue_libevent.cc',
-            'task_queue_posix.cc',
+          'sources' : [
+            '../../webrtc_overrides/webrtc/base/task_queue.h',
+          ]

[tommi, 2016/08/30 16:26:04]

Remove this section. We don't explicitly add override sources. 

[perkj_webrtc, 2016/08/30 20:00:18]

This is inline with how we build logging.cc and h webrtc_overrrides. Sure we
dont need the header file in this cl but we need the cc file in the next.  Or do
I misunderstand what you mean? 

+        } , {
+          # If not build for chromium, use our own implementation.
+          'sources' : [
+            'task_queue.h',
+            'task_queue_posix.h',
           ],
-          'defines': [ 'WEBRTC_BUILD_LIBEVENT' ],
-          'all_dependent_settings': {
-            'defines': [ 'WEBRTC_BUILD_LIBEVENT' ]
-          },
-        }, {
-          # If not libevent, fall back to the other task queues.
           'conditions': [
-            ['OS=="mac" or OS=="ios"', {
-             'sources': [
-               'task_queue_gcd.cc',
-               'task_queue_posix.cc',
-             ],
+            ['build_libevent==1', {
+              'dependencies': [
+                '<(DEPTH)/base/third_party/libevent/libevent.gyp:libevent',
+              ],
             }],
-            ['OS=="win"', {
-              'sources': [ 'task_queue_win.cc' ],
-            }]
-          ],
+            ['enable_libevent==1', {
+              'sources': [
+                'task_queue_libevent.cc',
+                'task_queue_posix.cc',
+              ],
+              'defines': [ 'WEBRTC_BUILD_LIBEVENT' ],
+              'all_dependent_settings': {
+                'defines': [ 'WEBRTC_BUILD_LIBEVENT' ]
+              },
+            }, {
+              # If not libevent, fall back to the other task queues.
+              'conditions': [
+                ['OS=="mac" or OS=="ios"', {
+                 'sources': [
+                   'task_queue_gcd.cc',
+                   'task_queue_posix.cc',
+                 ],
+                }],
+                ['OS=="win"', {
+                  'sources': [ 'task_queue_win.cc' ],
+                }]
+              ],
+            }],
+          ]
         }],
       ],
     },
     {
       'target_name': 'rtc_base',
       'type': 'static_library',
       'dependencies': [
         '<(webrtc_root)/common.gyp:webrtc_common',
         'rtc_base_approved',
       ],
@@ skipping 467 matching lines @@
     },
     {
      'target_name': 'gtest_prod',
       'type': 'static_library',
       'sources': [
         'gtest_prod_util.h',
       ],
     },
   ],
 }