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/tools/perf | |
| 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/tools/perf')
| -rw-r--r-- | chromium/tools/perf/chrome_telemetry_build/BUILD.gn | 19 | ||||
| -rw-r--r-- | chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn | 6 |
2 files changed, 14 insertions, 11 deletions
diff --git a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn index 8c7ba3a5958..c4424f2f00a 100644 --- a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn +++ b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn @@ -48,10 +48,15 @@ group("telemetry_chrome_test") { } if (is_linux) { - data_deps += [ - "//third_party/breakpad:dump_syms($host_toolchain)", - "//third_party/crashpad/crashpad/tools:crashpad_database_util", - ] + data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] + + # CrOS currently has issues with the locally compiled version of + # crashpad_database_util, so only include it on traditional Linux + # platforms. + if (is_desktop_linux) { + data_deps += + [ "//third_party/crashpad/crashpad/tools:crashpad_database_util" ] + } } if (is_mac) { @@ -98,9 +103,11 @@ group("telemetry_chrome_test_without_chrome") { testonly = true data = [ - "//tools/perf/core/", # chrome_telemetry_build/ depends on core/ - "//tools/perf/chrome_telemetry_build/", "//components/crash/content/tools/generate_breakpad_symbols.py", + "//testing/scripts/common.py", + "//testing/xvfb.py", + "//tools/perf/chrome_telemetry_build/", + "//tools/perf/core/", # chrome_telemetry_build/ depends on core/ ] data_deps = [ "//third_party/catapult:telemetry_chrome_test_support", diff --git a/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn b/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn index 5213df73e4b..af889456cf5 100644 --- a/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn +++ b/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn @@ -13,7 +13,6 @@ group("vr_perf_tests") { "./__init__.py", "./shared_vr_page_state.py", "./vr_benchmarks.py", - "./vr_browsing_mode_pages.py", "./vr_sample_page.py", "./vr_story_set.py", "./webvr_sample_pages.py", @@ -36,10 +35,7 @@ group("vr_perf_tests") { "//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk", ] - data_deps += [ - "//chrome/android:chrome_modern_public_bundle", - "//chrome/android:vr_nfc_simulator_apk", - ] + data_deps += [ "//chrome/android:chrome_modern_public_bundle" ] # We'll only ever use the assets if it's a Chrome-branded build. We don't have # a way of checking whether the files are actually present to copy, but the |