diff options
| author | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-13 09:02:54 +0000 |
|---|---|---|
| committer | kjellander@webrtc.org <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-13 09:02:54 +0000 |
| commit | ccf0fef3741cbc1a499d9be260d3df142a2ec85d (patch) | |
| tree | 0369dc203d2a0211b8120d57f5ab752924ccccd6 /modules | |
| parent | 5faa6d1febfbd0751fdebf4b4106050be29c6637 (diff) | |
| download | webrtc-ccf0fef3741cbc1a499d9be260d3df142a2ec85d.tar.gz | |
GN: Fix include paths for WebRTC in Chromium build.
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/webrtc@6670 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/desktop_capture/BUILD.gn | 4 | ||||
| -rw-r--r-- | modules/remote_bitrate_estimator/BUILD.gn | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn index be9658f8..55853fb0 100644 --- a/modules/desktop_capture/BUILD.gn +++ b/modules/desktop_capture/BUILD.gn @@ -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"] } diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn index 7ee4c8df..cc643dad 100644 --- a/modules/remote_bitrate_estimator/BUILD.gn +++ b/modules/remote_bitrate_estimator/BUILD.gn @@ -14,4 +14,6 @@ source_set("remote_bitrate_estimator") { "remote_rate_control.cc", "remote_rate_control.h", ] + + configs += [ "../../:common_inherited_config"] } |