Move third_party/libjingle/overrides to third_party/webrtc_overrides

third_party/libjingle/BUILD.gn

 # 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.
 
 import("//build/config/features.gni")
 
 # From third_party/libjingle/libjingle.gyp's target_defaults.
 config("jingle_unexported_configs") {
   defines = [
     "EXPAT_RELATIVE_PATH",
     "FEATURE_ENABLE_SSL",
     "GTEST_RELATIVE_PATH",
     "HAVE_OPENSSL_SSL_H",
     "HAVE_SCTP",
     "HAVE_SRTP",
     "HAVE_WEBRTC_VIDEO",
     "HAVE_WEBRTC_VOICE",
     "LOGGING_INSIDE_WEBRTC",
     "NO_MAIN_THREAD_WRAPPING",
     "NO_SOUND_SYSTEM",
     "SRTP_RELATIVE_PATH",
     "SSL_USE_OPENSSL",
     "USE_WEBRTC_DEV_BRANCH",
     "ENABLE_EXTERNAL_AUTH",
     "WEBRTC_CHROMIUM_BUILD",
   ]
 
   include_dirs = [
-    "overrides",
     "../../third_party/webrtc_overrides",
-    "source",
     "../../testing/gtest/include",
     "../../third_party",
     "../../third_party/libyuv/include",
     "../../third_party/usrsctp/usrsctplib",
   ]
 }
 
 # From third_party/libjingle/libjingle.gyp's target_defaults.
 config("jingle_public_configs") {
   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",
     "NO_SOUND_SYSTEM",
@@ skipping 163 matching lines @@
   }
 
   if (is_nacl) {
     # For NACL, we have to add a default implementation for field_trail.
     deps += [
       "//native_client_sdk/src/libraries/nacl_io",
       "//third_party/webrtc/system_wrappers:field_trial_default",
     ]
   } else {
     # Otherwise, we just add the field_trial which redirects to base.
-    sources += [ "overrides/field_trial.cc" ]
+    sources += [ "../webrtc_overrides/field_trial.cc" ]
   }
 
   configs += [ ":jingle_unexported_configs" ]
   public_configs = [ ":jingle_public_configs" ]
 }
 
 if (enable_webrtc) {
+  # 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.
   source_set("libjingle_webrtc") {
     sources = [
-      "overrides/init_webrtc.cc",
-      "overrides/init_webrtc.h",
+      "../webrtc_overrides/init_webrtc.cc",
+      "../webrtc_overrides/init_webrtc.h",
     ]
     configs += [ ":jingle_unexported_configs" ]
     public_configs = [ ":jingle_public_configs" ]
     public_deps = [
       ":libjingle_webrtc_common",
     ]
   }
 
   source_set("libjingle_webrtc_common") {
     sources = [
@@ skipping 155 matching lines @@
     sources = [
       "$p2p_dir/stunprober/stunprober.cc",
     ]
 
     deps = [
       ":libjingle_webrtc_common",
       "//third_party/webrtc/base:rtc_base",
     ]
   }
 }  # enable_webrtc