Update build files to use webrtc_overrides in Chromium instead of overrides.

This is a part of moving the overrides to Chromium. See bug comment #65 for all steps.

BUG=chromium:468375

Review URL: https://codereview.webrtc.org/1354933002

Cr-Commit-Position: refs/heads/master@{#9996}

webrtc/BUILD.gn

diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 56d06cf..1096bb4 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -23,9 +23,9 @@
   if (build_with_chromium) {
     defines = [ "WEBRTC_CHROMIUM_BUILD" ]
     include_dirs = [
-      # overrides must be included first as that is the mechanism for
+      # The overrides must be included first as that is the mechanism for
       # selecting the override headers in Chromium.
-      "overrides",
+      "../webrtc_overrides",
 
       # Allow includes to be prefixed with webrtc/ in case it is not an
       # immediate subdirectory of the top-level.

webrtc/base/BUILD.gn

diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index ed0690c..c4d8a4f 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -332,18 +332,18 @@
 
   if (build_with_chromium) {
     sources += [
-      "../overrides/webrtc/base/logging.cc",
-      "../overrides/webrtc/base/logging.h",
+      "../../webrtc_overrides/webrtc/base/logging.cc",
+      "../../webrtc_overrides/webrtc/base/logging.h",
     ]
 
     deps += [ "..:webrtc_common" ]
 
     if (is_win) {
-      sources += [ "../overrides/webrtc/base/win32socketinit.cc" ]
+      sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
     }
 
     include_dirs = [
-      "../overrides",
+      "../../webrtc_overrides",
       "../../boringssl/src/include",
     ]
 

webrtc/base/base.gyp

diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index 1536b4f..755cb3f 100644
--- a/webrtc/base/base.gyp
+++ b/webrtc/base/base.gyp
@@ -84,7 +84,7 @@
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
-            '../overrides',
+            '../../webrtc_overrides',
           ],
           'sources!': [
             'basictypes.h',
@@ -338,9 +338,9 @@
         'worker.h',
         'x11windowpicker.cc',
         'x11windowpicker.h',
-        '../overrides/webrtc/base/logging.cc',
-        '../overrides/webrtc/base/logging.h',
-        '../overrides/webrtc/base/win32socketinit.cc',
+        '../../webrtc_overrides/webrtc/base/logging.cc',
+        '../../webrtc_overrides/webrtc/base/logging.h',
+        '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
       ],
       # TODO(henrike): issue 3307, make rtc_base build without disabling
       # these flags.
@@ -366,7 +366,7 @@
       'conditions': [
         ['build_with_chromium==1', {
           'include_dirs': [
-            '../overrides',
+            '../../webrtc_overrides',
             '../../boringssl/src/include',
           ],
           'sources!': [
@@ -481,9 +481,9 @@
             }],
           ],
           'sources!': [
-            '../overrides/webrtc/base/win32socketinit.cc',
-            '../overrides/webrtc/base/logging.cc',
-            '../overrides/webrtc/base/logging.h',
+            '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
+            '../../webrtc_overrides/webrtc/base/logging.cc',
+            '../../webrtc_overrides/webrtc/base/logging.h',
           ],
         }],
         ['use_openssl==1', {

webrtc/build/common.gypi

diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index be1451d..7567fbd 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -223,7 +223,7 @@
           '<(DEPTH)',
           # The overrides must be included before the WebRTC root as that's the
           # mechanism for selecting the override headers in Chromium.
-          '../overrides',
+          '../../webrtc_overrides',
           # The WebRTC root is needed to allow includes in the WebRTC code base
           # to be prefixed with webrtc/.
           '../..',
@@ -408,9 +408,9 @@
             'WEBRTC_CHROMIUM_BUILD',
           ],
           'include_dirs': [
-            # overrides must be included first as that is the mechanism for
+            # The overrides must be included first as that is the mechanism for
             # selecting the override headers in Chromium.
-            '../overrides',
+            '../../webrtc_overrides',
             '../..',
           ],
         }, {