admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Update build files to use webrtc_overrides in Chromium instead of overrides. (patchset #2 id:20001 of https://codereview.webrtc.org/1354933002/ )

Browse Source 
Reason for revert:
Breaks FYI bots.

ninja: error: '../../third_party/webrtc_overrides/webrtc/base/logging.cc', needed by 'obj/third_party/webrtc_overrides/webrtc/base/rtc_base.logging.o', missing and no known rule to make it

Original issue's description:
> 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
>
> Committed: https://crrev.com/baae0a8a6c873ddf812a5687b84638359b2e7e5b
> Cr-Commit-Position: refs/heads/master@{#9996}

TBR=kjellander@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=chromium:468375

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

Cr-Commit-Position: refs/heads/master@{#9998}
This commit is contained in:
henrikg 2015-09-21 03:29:25 -07:00 committed by Commit bot
parent 780be75190
commit 40bf493754
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/BUILD.gn
View File

@ -23,9 +23,9 @@ config("common_inherited_config") {
if (build_with_chromium) {
defines = [ "WEBRTC_CHROMIUM_BUILD" ]
include_dirs = [
# The overrides must be included first as that is the mechanism for
# overrides must be included first as that is the mechanism for
# selecting the override headers in Chromium.
"../webrtc_overrides",
"overrides",
# Allow includes to be prefixed with webrtc/ in case it is not an
# immediate subdirectory of the top-level.

8
webrtc/base/BUILD.gn
View File

@ -332,18 +332,18 @@ static_library("rtc_base") {
if (build_with_chromium) {
sources += [
"../../webrtc_overrides/webrtc/base/logging.cc",
"../../webrtc_overrides/webrtc/base/logging.h",
"../overrides/webrtc/base/logging.cc",
"../overrides/webrtc/base/logging.h",
]
deps += [ "..:webrtc_common" ]
if (is_win) {
sources += [ "../../webrtc_overrides/webrtc/base/win32socketinit.cc" ]
sources += [ "../overrides/webrtc/base/win32socketinit.cc" ]
}
include_dirs = [
"../../webrtc_overrides",
"../overrides",
"../../boringssl/src/include",
]

16
webrtc/base/base.gyp
View File

@ -84,7 +84,7 @@
'conditions': [
['build_with_chromium==1', {
'include_dirs': [
'../../webrtc_overrides',
'../overrides',
],
'sources!': [
'basictypes.h',
@ -338,9 +338,9 @@
'worker.h',
'x11windowpicker.cc',
'x11windowpicker.h',
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
'../../webrtc_overrides/webrtc/base/win32socketinit.cc',
'../overrides/webrtc/base/logging.cc',
'../overrides/webrtc/base/logging.h',
'../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': [
'../../webrtc_overrides',
'../overrides',
'../../boringssl/src/include',
],
'sources!': [
@ -481,9 +481,9 @@
}],
],
'sources!': [
'../../webrtc_overrides/webrtc/base/win32socketinit.cc',
'../../webrtc_overrides/webrtc/base/logging.cc',
'../../webrtc_overrides/webrtc/base/logging.h',
'../overrides/webrtc/base/win32socketinit.cc',
'../overrides/webrtc/base/logging.cc',
'../overrides/webrtc/base/logging.h',
],
}],
['use_openssl==1', {

6
webrtc/build/common.gypi
View File

@ -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.
'../../webrtc_overrides',
'../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': [
# The overrides must be included first as that is the mechanism for
# overrides must be included first as that is the mechanism for
# selecting the override headers in Chromium.
'../../webrtc_overrides',
'../overrides',
'../..',
],
}, {