Rearrange dependency to enable adding finch experiment in webrtc

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
     '../../build/win_precompile.gypi',
   ],
   'variables': {
     'enabled_libjingle_device_manager%': 0,
@@ skipping 226 matching lines @@
     # GN version: //third_party/libjingle
     {
       'target_name': 'libjingle',
       'type': 'static_library',
       'includes': [ 'libjingle_common.gypi' ],
       'sources!' : [
         # Compiled as part of libjingle_p2p_constants.
         '<(webrtc_p2p)/base/constants.cc',
         '<(webrtc_p2p)/base/constants.h',
       ],
+      # p2ptransportchannel.cc now depends on field_trial. For NACL build, a

[Sergey Ulanov, 2015/10/26 17:43:31]

I don't think you need to mention the name of the file here - how field_trial is
used will probably change in the future.

[guoweis_left_chromium, 2015/10/26 18:16:44]

Done.

+      # default implementation is added instead in libjingle_nacl.
+      'sources': [

[Sergey Ulanov, 2015/10/26 17:43:31]

For consistency with other overrides please move this to the list in
libjingle_common.gypi and then exclude it in sources! in libjingle_nacl.gyp

[guoweis_left_chromium, 2015/10/26 18:16:44]

Done.

+        'overrides/field_trial.cc',
+      ],
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
         'libjingle_p2p_constants',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
     # This has to be is a separate project due to a bug in MSVS 2008 and the
     # current toolset on android.  The problem is that we have two files named
     # "constants.cc" and MSVS/android doesn't handle this properly.
@@ skipping 260 matching lines @@
           'conditions': [
             ['OS=="android"', {
               'standalone_static_library': 1,
             }],
           ],
         },  # target libpeerconnection
       ],
     }],
   ],
 }