Move third_party/libjingle/overrides to third_party/webrtc_overrides

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",
     'webrtc_system_wrappers': "../webrtc/system_wrappers",
   },
   'includes': [
     '../../native_client/build/untrusted.gypi',
   ],
   'targets': [
     {
@@ skipping 19 matching lines @@
         'HAVE_OPENSSL_SSL_H',
         'NO_MAIN_THREAD_WRAPPING',
         'NO_SOUND_SYSTEM',
         'WEBRTC_POSIX',
         'SRTP_RELATIVE_PATH',
         'SSL_USE_OPENSSL',
         'USE_WEBRTC_DEV_BRANCH',
         'timezone=_timezone',
       ],
       'include_dirs': [
-        './<(libjingle_source)',
         '../',
       ],
       'includes': ['libjingle_common.gypi', ],
       # TODO(sergeyu): Depend on webrtc/base.gyp:rtc_base_approved?
       'sources': [
         '<(webrtc_base)/asyncfile.cc',
         '<(webrtc_base)/asyncfile.h',
         '<(webrtc_base)/asyncinvoker.cc',
         '<(webrtc_base)/asyncinvoker.h',
         '<(webrtc_base)/asyncinvoker-inl.h',
@@ skipping 189 matching lines @@
         '<(webrtc_xmllite)/xmlparser.h',
         '<(webrtc_xmllite)/xmlprinter.cc',
         '<(webrtc_xmllite)/xmlprinter.h',
         '<(webrtc_system_wrappers)/include/field_trial_default.h',
         '<(webrtc_system_wrappers)/include/field_trial.h',
         '<(webrtc_system_wrappers)/source/field_trial_default.cc',
       ],
       'sources!': [
         # For NACL, we have the field_trial_default and don't need the
         # field_trail.cc.
-        'overrides/field_trial.cc',
+        '../webrtc_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)$'],
           ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          './overrides',
-          './<(libjingle_source)',
           '../../third_party/webrtc_overrides',
           '../../third_party',
           '../../third_party/webrtc',
         ],
         'defines': [
           'EXPAT_RELATIVE_PATH',
           'FEATURE_ENABLE_SSL',
           'GTEST_RELATIVE_PATH',
           'NO_MAIN_THREAD_WRAPPING',
           'NO_SOUND_SYSTEM',
           'WEBRTC_POSIX',
           'SRTP_RELATIVE_PATH',
           'SSL_USE_OPENSSL',
           'USE_WEBRTC_DEV_BRANCH',
         ],
       },
       'export_dependent_settings': [
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
       ],
     },  # end of target 'libjingle_nacl'
   ],
 }