From dc0dbad5e55c6e5ba9370c940735dc622aa7f52e Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 2 Jun 2016 13:29:07 +0200 Subject: [PATCH] GN: Exclude tools and tests in Chromium builds. BUG=webrtc:5949 TBR=guidou@webrtc.org NOTRY=True Review URL: https://codereview.webrtc.org/2038493002 . Cr-Commit-Position: refs/heads/master@{#13015} --- webrtc/system_wrappers/BUILD.gn | 85 +++++++-------- webrtc/tools/BUILD.gn | 176 ++++++++++++++++---------------- 2 files changed, 134 insertions(+), 127 deletions(-) diff --git a/webrtc/system_wrappers/BUILD.gn b/webrtc/system_wrappers/BUILD.gn index 07b8bec5dc..1116419f1f 100644 --- a/webrtc/system_wrappers/BUILD.gn +++ b/webrtc/system_wrappers/BUILD.gn @@ -193,52 +193,55 @@ if (is_linux) { } } -test("system_wrappers_unittests") { - testonly = true - sources = [ - "source/aligned_array_unittest.cc", - "source/aligned_malloc_unittest.cc", - "source/clock_unittest.cc", - "source/condition_variable_unittest.cc", - "source/critical_section_unittest.cc", - "source/data_log_c_helpers_unittest.c", - "source/data_log_c_helpers_unittest.h", - "source/data_log_helpers_unittest.cc", - "source/event_timer_posix_unittest.cc", - "source/logging_unittest.cc", - "source/metrics_default_unittest.cc", - "source/metrics_unittest.cc", - "source/ntp_time_unittest.cc", - "source/rtp_to_ntp_unittest.cc", - "source/stl_util_unittest.cc", - "source/stringize_macros_unittest.cc", - ] - if (rtc_enable_data_logging) { - sources += [ - "source/data_log_unittest.cc", - "source/data_log_unittest_disabled.cc", +# There's no point processing WebRTC standalone tests in a Chromium build. +if (!build_with_chromium) { + test("system_wrappers_unittests") { + testonly = true + sources = [ + "source/aligned_array_unittest.cc", + "source/aligned_malloc_unittest.cc", + "source/clock_unittest.cc", + "source/condition_variable_unittest.cc", + "source/critical_section_unittest.cc", + "source/data_log_c_helpers_unittest.c", + "source/data_log_c_helpers_unittest.h", + "source/data_log_helpers_unittest.cc", + "source/event_timer_posix_unittest.cc", + "source/logging_unittest.cc", + "source/metrics_default_unittest.cc", + "source/metrics_unittest.cc", + "source/ntp_time_unittest.cc", + "source/rtp_to_ntp_unittest.cc", + "source/stl_util_unittest.cc", + "source/stringize_macros_unittest.cc", ] - } + if (rtc_enable_data_logging) { + sources += [ + "source/data_log_unittest.cc", + "source/data_log_unittest_disabled.cc", + ] + } - configs += [ "..:common_config" ] - public_configs = [ "..:common_inherited_config" ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config" ] - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - if (is_clang) { - # 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" ] - } + if (is_clang) { + # 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" ] + } - deps = [ - ":metrics_default", - ":system_wrappers", - "../test:test_support_main", - "//testing/gtest", - ] + deps = [ + ":metrics_default", + ":system_wrappers", + "../test:test_support_main", + "//testing/gtest", + ] - if (is_android) { - deps += [ "//testing/android/native_test:native_test_support" ] + if (is_android) { + deps += [ "//testing/android/native_test:native_test_support" ] + } } } diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn index 24b57f5dad..c463fce898 100644 --- a/webrtc/tools/BUILD.gn +++ b/webrtc/tools/BUILD.gn @@ -163,111 +163,115 @@ source_set("agc_test_utils") { public_configs = [ "..:common_inherited_config" ] } -executable("agc_harness") { - testonly = true - sources = [ - "agc/agc_harness.cc", - ] +# Exclude tools depending on gflags since that's not available in Chromium. +# There's no point processing WebRTC standalone tests in a Chromium build. +if (!build_with_chromium) { + executable("agc_harness") { + testonly = true + sources = [ + "agc/agc_harness.cc", + ] - configs += [ "..:common_config" ] - public_configs = [ "..:common_inherited_config" ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config" ] - if (is_clang) { - # Suppress warnings from the Chromium Clang plugin. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] + if (is_clang) { + # Suppress warnings from the Chromium Clang plugin. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } + + deps = [ + "../system_wrappers:system_wrappers_default", + "../test:channel_transport", + "../test:test_support", + "../voice_engine", + "//build/win:default_exe_manifest", + "//testing/gtest", + "//third_party/gflags", + ] } - deps = [ - "../system_wrappers:system_wrappers_default", - "../test:channel_transport", - "../test:test_support", - "../voice_engine", - "//build/win:default_exe_manifest", - "//testing/gtest", - "//third_party/gflags", - ] -} + executable("activity_metric") { + testonly = true + sources = [ + "agc/activity_metric.cc", + ] -executable("activity_metric") { - testonly = true - sources = [ - "agc/activity_metric.cc", - ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config" ] - configs += [ "..:common_config" ] - public_configs = [ "..:common_inherited_config" ] + if (is_clang) { + # Suppress warnings from the Chromium Clang plugin. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } - if (is_clang) { - # Suppress warnings from the Chromium Clang plugin. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] + deps = [ + "../modules/audio_processing", + "../system_wrappers:metrics_default", + "//build/win:default_exe_manifest", + "//testing/gtest", + "//third_party/gflags", + ] } - deps = [ - "../modules/audio_processing", - "../system_wrappers:metrics_default", - "//build/win:default_exe_manifest", - "//testing/gtest", - "//third_party/gflags", - ] -} + executable("audio_e2e_harness") { + testonly = true + sources = [ + "e2e_quality/audio/audio_e2e_harness.cc", + ] -executable("audio_e2e_harness") { - testonly = true - sources = [ - "e2e_quality/audio/audio_e2e_harness.cc", - ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config" ] - configs += [ "..:common_config" ] - public_configs = [ "..:common_inherited_config" ] + if (is_clang) { + # Suppress warnings from the Chromium Clang plugin. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } - if (is_clang) { - # Suppress warnings from the Chromium Clang plugin. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] + deps = [ + "../system_wrappers:system_wrappers_default", + "../test:channel_transport", + "../voice_engine", + "//build/win:default_exe_manifest", + "//testing/gtest", + "//third_party/gflags", + ] } - deps = [ - "../system_wrappers:system_wrappers_default", - "../test:channel_transport", - "../voice_engine", - "//build/win:default_exe_manifest", - "//testing/gtest", - "//third_party/gflags", - ] -} + test("tools_unittests") { + testonly = true -test("tools_unittests") { - testonly = true + sources = [ + "frame_analyzer/video_quality_analysis_unittest.cc", + "frame_editing/frame_editing_unittest.cc", + "simple_command_line_parser_unittest.cc", + ] - sources = [ - "frame_analyzer/video_quality_analysis_unittest.cc", - "frame_editing/frame_editing_unittest.cc", - "simple_command_line_parser_unittest.cc", - ] + configs += [ "..:common_config" ] + public_configs = [ "..:common_inherited_config" ] - configs += [ "..:common_config" ] - public_configs = [ "..:common_inherited_config" ] + # TODO(jschuh): Bug 1348: fix this warning. + configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] - # TODO(jschuh): Bug 1348: fix this warning. - configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] + if (is_clang) { + # Suppress warnings from the Chromium Clang plugin. + # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. + configs -= [ "//build/config/clang:find_bad_constructs" ] + } - if (is_clang) { - # Suppress warnings from the Chromium Clang plugin. - # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. - configs -= [ "//build/config/clang:find_bad_constructs" ] - } + deps = [ + ":command_line_parser", + ":frame_editing_lib", + ":video_quality_analysis", + "../test:test_support_main", + "//testing/gtest", + ] - deps = [ - ":command_line_parser", - ":frame_editing_lib", - ":video_quality_analysis", - "../test:test_support_main", - "//testing/gtest", - ] - - if (is_android) { - deps += [ "//testing/android/native_test:native_test_support" ] + if (is_android) { + deps += [ "//testing/android/native_test:native_test_support" ] + } } }