diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/base/test/BUILD.gn | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/test/BUILD.gn')
| -rw-r--r-- | chromium/base/test/BUILD.gn | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/chromium/base/test/BUILD.gn b/chromium/base/test/BUILD.gn index 86b11128e51..4d8906aa2dd 100644 --- a/chromium/base/test/BUILD.gn +++ b/chromium/base/test/BUILD.gn @@ -5,6 +5,7 @@ import("//build/compiled_action.gni") import("//build/config/nacl/config.gni") import("//build/config/ui.gni") +import("//build_overrides/build.gni") # Reset sources_assignment_filter for the BUILD.gn file to prevent # regression during the migration of Chromium away from the feature. @@ -46,13 +47,14 @@ static_library("test_support") { "../task/sequence_manager/test/test_task_time_observer.h", "../timer/mock_timer.cc", "../timer/mock_timer.h", - "../trace_event/trace_config_memory_test_util.h", "bind_test_util.cc", "bind_test_util.h", "copy_only_int.cc", "copy_only_int.h", "gmock_callback_support.h", "gmock_move_support.h", + "gtest_links.cc", + "gtest_links.h", "gtest_util.cc", "gtest_util.h", "gtest_xml_unittest_result_printer.cc", @@ -138,10 +140,6 @@ static_library("test_support") { "test_waitable_event.h", "thread_test_helper.cc", "thread_test_helper.h", - "trace_event_analyzer.cc", - "trace_event_analyzer.h", - "trace_to_file.cc", - "trace_to_file.h", "values_test_util.cc", "values_test_util.h", "with_feature_override.cc", @@ -281,8 +279,6 @@ static_library("test_support") { "test_file_util_posix.cc", "test_suite.cc", "test_suite.h", - "trace_to_file.cc", - "trace_to_file.h", ] public_deps -= [ "//base:i18n" ] deps -= [ @@ -303,6 +299,20 @@ static_library("test_support") { "multiprocess_test.cc", ] } + + if (enable_base_tracing) { + sources += [ + "../trace_event/trace_config_memory_test_util.h", + "trace_event_analyzer.cc", + "trace_event_analyzer.h", + ] + if (!is_nacl_nonsfi) { + sources += [ + "trace_to_file.cc", + "trace_to_file.h", + ] + } + } } config("base_test_implementation") { @@ -429,10 +439,7 @@ if (is_linux) { # be listed in deps, not data_deps (https://crbug.com/919422). deps = [ "//third_party/test_fonts" ] args = [] - outputs = [ - "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-7", - "$root_out_dir/test_fonts/.uuid", - ] + outputs = [ "$root_out_dir/fontconfig_caches/fb5c91b2895aa445d23aebf7f9e2189c-le64.cache-7" ] } } } |