Update build files to use webrtc_overrides in Chromium instead of overrides.
This re-lands https://codereview.webrtc.org/1354933002/
This is a part of moving the overrides to Chromium. See bug comment #65 for all steps.
Depends on https://codereview.chromium.org/1345873004/
BUG=chromium:468375
Review URL: https://codereview.webrtc.org/1345313004
Cr-Commit-Position: refs/heads/master@{#10115}
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index 5c3d9bc..ac14d7d 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.
diff --git a/webrtc/base/BUILD.gn b/webrtc/base/BUILD.gn
index dec6277..38beee9 100644
--- a/webrtc/base/BUILD.gn
+++ b/webrtc/base/BUILD.gn
@@ -315,18 +315,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",
]
diff --git a/webrtc/base/base.gyp b/webrtc/base/base.gyp
index b111dac..78742e0 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',
@@ -349,9 +349,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.
@@ -379,7 +379,7 @@
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
- '../overrides',
+ '../../webrtc_overrides',
'../../boringssl/src/include',
],
'sources!': [
@@ -494,9 +494,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',
],
}],
['OS == "android"', {
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index 7b17d43..4c2522e 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/.
'../..',
@@ -404,9 +404,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',
'../..',
],
}, {
