Move third_party/libjingle/overrides to third_party/webrtc_overrides

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',
   ],
   # Most of these settings have been split according to their scope into
   # :jingle_unexported_configs and :jingle_public_config in the GN build.
@@ skipping 10 matching lines @@
       'HAVE_WEBRTC_VOICE',
       'LOGGING_INSIDE_WEBRTC',
       'NO_MAIN_THREAD_WRAPPING',
       'NO_SOUND_SYSTEM',
       'SRTP_RELATIVE_PATH',
       'SSL_USE_OPENSSL',
       'USE_WEBRTC_DEV_BRANCH',
       'WEBRTC_CHROMIUM_BUILD',
     ],
     'include_dirs': [
-      './overrides',
       '../../third_party/webrtc_overrides',
-      './source',
       '../..',
       '../../testing/gtest/include',
       '../../third_party',
       '../../third_party/libyuv/include',
       '../../third_party/usrsctp/usrsctplib',
     ],
     # These dependencies have been translated into :jingle_deps in the GN build.
     'dependencies': [
       '<(DEPTH)/base/base.gyp:base',
       '<(DEPTH)/net/net.gyp:net',
       '<(DEPTH)/third_party/boringssl/boringssl.gyp:boringssl',
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'export_dependent_settings': [
       '<(DEPTH)/third_party/expat/expat.gyp:expat',
     ],
     'direct_dependent_settings': {
       'include_dirs': [
         '../../third_party/webrtc_overrides',
-        './overrides',
-        './source',
         '../..',
         '../../testing/gtest/include',
         '../../third_party',
       ],
       'defines': [
         'FEATURE_ENABLE_SSL',
         'FEATURE_ENABLE_VOICEMAIL',
         'EXPAT_RELATIVE_PATH',
         'GTEST_RELATIVE_PATH',
         'NO_MAIN_THREAD_WRAPPING',
@@ skipping 291 matching lines @@
             '<(DEPTH)/third_party/libsrtp/libsrtp.gyp:libsrtp',
             '<(DEPTH)/third_party/usrsctp/usrsctp.gyp:usrsctplib',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:media_file',
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture',
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
             '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
             'libjingle',
           ],
         },  # target libjingle_webrtc_common
         {
+          # TODO(kjellander): Move this target into
+          # //third_party/webrtc_overrides as soon as the work in
+          # bugs.webrtc.org/4256 has gotten rid of the duplicated source
+          # listings above.
           # GN version: //third_party/libjingle:libjingle_webrtc
           'target_name': 'libjingle_webrtc',
           'type': 'static_library',
           'sources': [
-            'overrides/init_webrtc.cc',
-            'overrides/init_webrtc.h',
+            '../webrtc_overrides/init_webrtc.cc',
+            '../webrtc_overrides/init_webrtc.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/webrtc/modules/modules.gyp:audio_processing',
             'libjingle_webrtc_common',
           ],
         },
       ],
     }],
   ],
 }