Rearrange dependency to enable adding finch experiment in webrtc

third_party/libjingle/libjingle_nacl.gyp

 # Copyright 2014 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.
 
 {
   'variables': {
     'libjingle_source': "source",
     'webrtc_base': "../webrtc/base",
     'webrtc_xmllite': "../webrtc/libjingle/xmllite",
     'webrtc_p2p': "../webrtc/p2p",
@@ skipping 240 matching lines @@
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
         '<(webrtc_system_wrappers)/interface/field_trial_default.h',
         '<(webrtc_system_wrappers)/interface/field_trial.h',
         '<(webrtc_system_wrappers)/source/field_trial_default.cc',
       ],
       'sources!': [
         # Compiled as part of libjingle_p2p_constants_nacl.
         '<(webrtc_p2p)/base/constants.cc',
         '<(webrtc_p2p)/base/constants.h',
+        # For NACL, we have the field_trial_default and don't need the
+        # field_trail.cc.
+        'overrides/field_trial.cc',
       ],
       'sources/': [
         ['exclude', '/mac[a-z]+\\.(h|cc)$'],
         ['exclude', '/scoped_autorelease_pool\\.(h|mm)$'],
       ],
       'conditions': [
         ['OS!="win"', {
           'sources/': [
             ['exclude', '/win[a-z0-9]+\\.(h|cc)$'],
           ],
@@ skipping 47 matching lines @@
         './<(libjingle_source)',
         '../'
       ],
       'sources': [
         '<(webrtc_p2p)/base/constants.cc',
         '<(webrtc_p2p)/base/constants.h',
       ],
     },  # end of target 'libjingle_p2p_constants_nacl'
   ],
 }