summaryrefslogtreecommitdiff
path: root/chromium/tools/perf
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 11:40:17 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-05-24 12:42:11 +0000
commit5d87695f37678f96492b258bbab36486c59866b4 (patch)
treebe9783bbaf04fb930c4d74ca9c00b5e7954c8bc6 /chromium/tools/perf
parent6c11fb357ec39bf087b8b632e2b1e375aef1b38b (diff)
downloadqtwebengine-chromium-5d87695f37678f96492b258bbab36486c59866b4.tar.gz
BASELINE: Update Chromium to 75.0.3770.56
Change-Id: I86d2007fd27a45d5797eee06f4c9369b8b50ac4f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/tools/perf')
-rw-r--r--chromium/tools/perf/chrome_telemetry_build/BUILD.gn21
-rw-r--r--chromium/tools/perf/contrib/media_router_benchmarks/BUILD.gn13
-rw-r--r--chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn47
3 files changed, 59 insertions, 22 deletions
diff --git a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
index 49c1ca31bb7..e1853f94c41 100644
--- a/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/chromium/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -20,7 +20,10 @@ group("telemetry_chrome_test") {
data = []
if (is_android) {
- data_deps += [ "//chrome/android:chrome_public_apk" ]
+ data_deps += [
+ "//android_webview/test:webview_instrumentation_apk",
+ "//chrome/android:chrome_public_apk",
+ ]
if (enable_chrome_android_internal) {
data_deps += [ "//clank:telemetry_clank_test" ]
@@ -83,22 +86,24 @@ group("telemetry_chrome_test") {
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",
+ ]
data_deps = [
"//third_party/catapult:telemetry_chrome_test_support",
]
if (is_android) {
+ data += [ "//build/android/stacktrace/" ]
data_deps += [
+ "//chrome/android/webapk/shell_apk:maps_go_webapk",
+ "//build/android:devil_chromium_py",
+ "//third_party/breakpad:dump_syms",
"//third_party/breakpad:minidump_dump",
"//third_party/breakpad:minidump_stackwalk",
- "//third_party/breakpad:dump_syms",
]
} else {
data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
}
-
- data = [
- "//tools/perf/core/", # chrome_telemetry_build/ depends on core/
- "//tools/perf/chrome_telemetry_build/",
- "//components/crash/content/tools/generate_breakpad_symbols.py",
- ]
}
diff --git a/chromium/tools/perf/contrib/media_router_benchmarks/BUILD.gn b/chromium/tools/perf/contrib/media_router_benchmarks/BUILD.gn
new file mode 100644
index 00000000000..5d1554b60c4
--- /dev/null
+++ b/chromium/tools/perf/contrib/media_router_benchmarks/BUILD.gn
@@ -0,0 +1,13 @@
+# Copyright 2019 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+copy("media_router_telemetry_extension") {
+ sources = [
+ "extension/manifest.json",
+ "extension/script.js",
+ ]
+ outputs = [
+ "$root_out_dir/media_router/media_router_telemetry_extension/{{source_file_part}}",
+ ]
+}
diff --git a/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn b/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn
index 7996169bc91..758057abdbc 100644
--- a/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn
+++ b/chromium/tools/perf/contrib/vr_benchmarks/BUILD.gn
@@ -3,15 +3,15 @@
# found in the LICENSE file.
import("//chrome/browser/vr/features.gni")
-
-assert(is_android)
+import("//device/vr/buildflags/buildflags.gni")
group("vr_perf_tests") {
testonly = true
data = [
"./data/",
+ "./desktop_runtimes/",
"./__init__.py",
- "./shared_android_vr_page_state.py",
+ "./shared_vr_page_state.py",
"./vr_benchmarks.py",
"./vr_browsing_mode_pages.py",
"./vr_sample_page.py",
@@ -19,26 +19,45 @@ group("vr_perf_tests") {
"./webvr_sample_pages.py",
"./webvr_wpr_pages.py",
"./webxr_sample_pages.py",
- "//chrome/android/shared_preference_files/test/",
- "//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
- "//third_party/gvr-android-sdk/test-apks/vr_keyboard/vr_keyboard_current.apk",
+
+ # For the ACL setup code.
+ "//chrome/browser/vr/test/run_xr_browser_tests.py",
"//chrome/test/data/xr/webvr_info/samples/",
- "//third_party/webxr_test_pages/webxr-samples",
+ "//third_party/webxr_test_pages/webxr-samples/",
]
data_deps = [
- "//chrome/android:vr_nfc_simulator_apk",
"//testing:run_perf_test",
]
- # 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
- # script will deal with that.
- if (use_vr_assets_component) {
- data_deps += [ ":generate_vr_assets_profile" ]
- }
deps = [
"//tools/perf:perf",
]
+
+ if (is_android) {
+ data += [
+ "//chrome/android/shared_preference_files/test/",
+ "//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk",
+ "//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",
+ ]
+
+ # 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
+ # script will deal with that.
+ if (use_vr_assets_component) {
+ data_deps += [ ":generate_vr_assets_profile" ]
+ }
+ }
+
+ if (is_win) {
+ if (enable_openvr) {
+ deps += [ "//device/vr:openvr_mock" ]
+ }
+ }
}
# Copies files to the gen/ directory and creates a manifest so that the VR