zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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}
This commit is contained in:
henrikg
2015-09-30 03:48:52 -07:00
committed by Commit bot
parent 6ba8e4a4f2
commit ee2bf41a79
4 changed files with 17 additions and 17 deletions
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) { if (build_with_chromium) {
defines = [ "WEBRTC_CHROMIUM_BUILD" ] defines = [ "WEBRTC_CHROMIUM_BUILD" ]
include_dirs = [ 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. # selecting the override headers in Chromium.
"overrides", "../webrtc_overrides",
# Allow includes to be prefixed with webrtc/ in case it is not an # Allow includes to be prefixed with webrtc/ in case it is not an
# immediate subdirectory of the top-level. # immediate subdirectory of the top-level.

8
webrtc/base/BUILD.gn
View File

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

16
webrtc/base/base.gyp
View File

@ -84,7 +84,7 @@
'conditions': [ 'conditions': [
['build_with_chromium==1', { ['build_with_chromium==1', {
'include_dirs': [ 'include_dirs': [
'../overrides', '../../webrtc_overrides',
], ],
'sources!': [ 'sources!': [
'basictypes.h', 'basictypes.h',
@ -349,9 +349,9 @@
'worker.h', 'worker.h',
'x11windowpicker.cc', 'x11windowpicker.cc',
'x11windowpicker.h', 'x11windowpicker.h',
'../overrides/webrtc/base/logging.cc', '../../webrtc_overrides/webrtc/base/logging.cc',
'../overrides/webrtc/base/logging.h', '../../webrtc_overrides/webrtc/base/logging.h',
'../overrides/webrtc/base/win32socketinit.cc', '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
], ],
# TODO(henrike): issue 3307, make rtc_base build without disabling # TODO(henrike): issue 3307, make rtc_base build without disabling
# these flags. # these flags.
@ -379,7 +379,7 @@
'conditions': [ 'conditions': [
['build_with_chromium==1', { ['build_with_chromium==1', {
'include_dirs': [ 'include_dirs': [
'../overrides', '../../webrtc_overrides',
'../../boringssl/src/include', '../../boringssl/src/include',
], ],
'sources!': [ 'sources!': [
@ -494,9 +494,9 @@
}], }],
], ],
'sources!': [ 'sources!': [
'../overrides/webrtc/base/win32socketinit.cc', '../../webrtc_overrides/webrtc/base/win32socketinit.cc',
'../overrides/webrtc/base/logging.cc', '../../webrtc_overrides/webrtc/base/logging.cc',
'../overrides/webrtc/base/logging.h', '../../webrtc_overrides/webrtc/base/logging.h',
], ],
}], }],
['OS == "android"', { ['OS == "android"', {

6
webrtc/build/common.gypi
View File

@ -223,7 +223,7 @@
'<(DEPTH)', '<(DEPTH)',
# The overrides must be included before the WebRTC root as that's the # The overrides must be included before the WebRTC root as that's the
# mechanism for selecting the override headers in Chromium. # mechanism for selecting the override headers in Chromium.
'../overrides', '../../webrtc_overrides',
# The WebRTC root is needed to allow includes in the WebRTC code base # The WebRTC root is needed to allow includes in the WebRTC code base
# to be prefixed with webrtc/. # to be prefixed with webrtc/.
'../..', '../..',
@ -404,9 +404,9 @@
'WEBRTC_CHROMIUM_BUILD', 'WEBRTC_CHROMIUM_BUILD',
], ],
'include_dirs': [ '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. # selecting the override headers in Chromium.
'../overrides', '../../webrtc_overrides',
'../..', '../..',
], ],
}, { }, {