From 9bef551ba17b1cfbee3201802ae5ce9bd1a53c55 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Sun, 13 Jul 2014 09:02:54 +0000 Subject: [PATCH] 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@6670 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/BUILD.gn | 4 ++++ webrtc/modules/desktop_capture/BUILD.gn | 4 ++++ webrtc/modules/remote_bitrate_estimator/BUILD.gn | 2 ++ 3 files changed, 10 insertions(+) diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index 6f9f06807f..04618bfb6c 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -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"] } diff --git a/webrtc/modules/desktop_capture/BUILD.gn b/webrtc/modules/desktop_capture/BUILD.gn index be9658f8b0..55853fb099 100644 --- a/webrtc/modules/desktop_capture/BUILD.gn +++ b/webrtc/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/webrtc/modules/remote_bitrate_estimator/BUILD.gn b/webrtc/modules/remote_bitrate_estimator/BUILD.gn index 7ee4c8df98..cc643dad5b 100644 --- a/webrtc/modules/remote_bitrate_estimator/BUILD.gn +++ b/webrtc/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"] }