generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GN: Fix include paths for WebRTC in Chromium build.

Browse Source 
Most WebRTC source files are using full paths for includes which
requires the root to be in the include path.

This is currently handled in the common_inherited_config config in
webrtc/BUILD.gn: the .. include_dir.

However, when built from Chromium, the include
paths are not inherited in the same way when building the all target.
Building the 'webrtc' target of Chrome works without the changes
in this CL, but the default target fails.

BUG=3441
TEST=Built the default target from a Chromium checkout with
https://codereview.chromium.org/321313006/ applied and
src/third_party/webrtc linked to the webrtc folder of the WebRTC
workspace.

R=brettw@chromium.org

Review URL: https://webrtc-codereview.appspot.com/15989004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6670 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2014-07-13 09:02:54 +00:00
parent 9e1acc8728
commit 9bef551ba1
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/BUILD.gn
View File

@ -180,6 +180,8 @@ static_library("webrtc") {
"transport.h",
]
direct_dependent_configs = [ ":common_inherited_config"]
deps = [
":webrtc_common",
"base:webrtc_base",
@ -210,4 +212,6 @@ source_set("webrtc_common") {
"config.h",
"config.cc",
]
configs += [ ":common_inherited_config"]
}

4
webrtc/modules/desktop_capture/BUILD.gn
View File

@ -105,6 +105,8 @@ source_set("desktop_capture") {
]
}
configs += [ "../../:common_inherited_config"]
deps = ["../../system_wrappers"]
if (use_desktop_capture_differ_sse2) {
@ -121,6 +123,8 @@ if (use_desktop_capture_differ_sse2) {
"differ_block_sse2.h",
]
configs += [ "../../:common_inherited_config"]
if (is_posix && !is_mac) {
cflags = ["-msse2"]
}

2
webrtc/modules/remote_bitrate_estimator/BUILD.gn
View File

@ -14,4 +14,6 @@ source_set("remote_bitrate_estimator") {
"remote_rate_control.cc",
"remote_rate_control.h",
]
configs += [ "../../:common_inherited_config"]
}