Fix MSVS project files generation.

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 69 matching lines @@
         'timeutils.cc',
         'timeutils.h',
         'trace_event.h',
       ],
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
             '../../webrtc_overrides',
           ],
           'sources!': [
-            'basictypes.h',
-            'constructormagic.h',
             'logging.cc',
             'logging.h',
           ],
         }],
       ],
     },
     {
       'target_name': 'rtc_base',
       'type': 'static_library',
       'dependencies': [
@@ skipping 240 matching lines @@
         'windowpicker.h',
         'windowpickerfactory.h',
         'winfirewall.cc',
         'winfirewall.h',
         'winping.cc',
         'winping.h',
         'worker.cc',
         'worker.h',
         'x11windowpicker.cc',
         'x11windowpicker.h',
-        '../../webrtc_overrides/webrtc/base/logging.cc',
-        '../../webrtc_overrides/webrtc/base/logging.h',
-        '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
       ],
       # TODO(henrike): issue 3307, make rtc_base build without disabling
       # these flags.
       'cflags!': [
         '-Wextra',
         '-Wall',
       ],
       'cflags_cc!': [
         '-Wnon-virtual-dtor',
       ],
@@ skipping 10 matching lines @@
       'include_dirs': [
         '../../third_party/jsoncpp/overrides/include',
         '../../third_party/jsoncpp/source/include',
       ],
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
             '../../webrtc_overrides',
             '../../boringssl/src/include',
           ],
+          'sources': [
+            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',

[kjellander_webrtc, 2015/10/03 17:06:30]

nit: sort alphabetically.

[Henrik Grunell WebRTC, 2015/10/05 07:29:32]

Will fix in follow-up.

+            '../../webrtc_overrides/webrtc/base/logging.cc',
+            '../../webrtc_overrides/webrtc/base/logging.h',
+          ],
           'sources!': [
             'atomicops.h',
             'bandwidthsmoother.cc',
             'bandwidthsmoother.h',
             'bind.h',
             'callback.h',
             'constructormagic.h',
             'dbus.cc',
             'dbus.h',
             'diskcache_win32.cc',
@@ skipping 91 matching lines @@
                 '<(json_root)',
               ],
               'defines': [
                 # When defined changes the include path for json.h to where it
                 # is expected to be when building json outside of the standalone
                 # build.
                 'WEBRTC_EXTERNAL_JSON',
               ],
             }],
           ],
-          'sources!': [
-            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
-            '../../webrtc_overrides/webrtc/base/logging.cc',
-            '../../webrtc_overrides/webrtc/base/logging.h',
-          ],
         }],
         ['OS == "android"', {
           'link_settings': {
             'libraries': [
               '-llog',
               '-lGLESv2',
             ],
           },
         }, {
           'sources!': [
@@ skipping 162 matching lines @@
           ],
         }, {
           'include_dirs': [
             '<(ssl_root)',
           ],
         }],
       ],
     },
   ],
 }