diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-01-20 17:01:36 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-20 17:01:36 +0000 |
commit | 9a337512d97e37afc142dee4fd50a41b741a87d2 (patch) | |
tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/BUILD.gn | |
parent | fe8b4a657979b49e1701bd92f6d5814a99e0b2be (diff) | |
parent | daef292e03c8d7d32e650495612f336c1830013a (diff) | |
download | webrtc-9a337512d97e37afc142dee4fd50a41b741a87d2.tar.gz |
Merge "Merge upstream SHA 04cb763"
Diffstat (limited to 'webrtc/BUILD.gn')
-rw-r--r-- | webrtc/BUILD.gn | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn index ac14d7d528..be824b7bc7 100644 --- a/webrtc/BUILD.gn +++ b/webrtc/BUILD.gn @@ -8,8 +8,8 @@ # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. -import("//build/config/crypto.gni") import("//build/config/linux/pkg_config.gni") +import("//build/config/sanitizers/sanitizers.gni") import("build/webrtc.gni") import("//third_party/protobuf/proto_library.gni") @@ -178,8 +178,8 @@ source_set("webrtc") { public_configs = [ ":common_inherited_config" ] deps = [ - "audio", ":webrtc_common", + "audio", "base:rtc_base", "call", "common_audio", @@ -219,8 +219,8 @@ if (!build_with_chromium) { testonly = true deps = [ ":webrtc", - "modules/video_render:video_render_internal_impl", "modules/video_capture:video_capture_internal_impl", + "modules/video_render:video_render_internal_impl", "test", ] } @@ -238,6 +238,12 @@ source_set("webrtc_common") { configs += [ ":common_config" ] public_configs = [ ":common_inherited_config" ] + + if (is_clang && !is_nacl) { + # Suppress warnings from Chrome's Clang plugins. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } } source_set("gtest_prod") { @@ -279,3 +285,14 @@ source_set("rtc_event_log") { configs -= [ "//build/config/clang:find_bad_constructs" ] } } + +if (use_libfuzzer || use_drfuzz) { + # This target is only here for gn to discover fuzzer build targets under + # webrtc/test/fuzzers/. + group("webrtc_fuzzers_dummy") { + testonly = true + deps = [ + "test/fuzzers:webrtc_fuzzer_main", + ] + } +} |