From 3037bc3447114f46830bb93ba49e70e21032f011 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Tue, 30 Sep 2014 19:07:58 +0000 Subject: [PATCH] GN: Add common configs to tools and test. Similar changes as in https://review.webrtc.org/28589004/ were missed in https://review.webrtc.org/25569004/. This should fix the Chromium WebRTC FYI bots that currently are broken due to lack of include paths. BUG=3441 TBR=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/25749004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7347 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/test/BUILD.gn | 9 +++++++++ webrtc/tools/BUILD.gn | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 3de1dcaf42..7bb11a14f4 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -28,6 +28,9 @@ source_set("field_trial") { "../system_wrappers", ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config"] + if (is_clang) { # Suppress warnings from Chrome's Clang plugins. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. @@ -70,6 +73,9 @@ source_set("test_support") { sources += [ "testsupport/android/root_path_android.cc" ] } + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config"] + if (is_clang) { # Suppress warnings from Chrome's Clang plugins. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. @@ -94,6 +100,9 @@ source_set("test_support_main") { "//third_party/gflags", ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config"] + if (is_clang) { # Suppress warnings from Chrome's Clang plugins. # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn index f66d8d5d5e..882a16e306 100644 --- a/webrtc/tools/BUILD.gn +++ b/webrtc/tools/BUILD.gn @@ -19,6 +19,9 @@ source_set("command_line_parser") { "simple_command_line_parser.h", "simple_command_line_parser.cc", ] + + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config"] } # TODO(kjellander): Convert all of tools.gyp into GN here. @@ -31,6 +34,9 @@ if (!build_with_chromium) { "simple_command_line_parser_unittest.cc", ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config"] + deps = [ ":command_line_parser", "../test:test_support_main",