Commit 00e54dbe authored by Caleb Rouleau's avatar Caleb Rouleau Committed by Commit Bot

[Benchmarking] Use WebLayerShellSystemWebView.apk implicitly.

https://chromium-review.googlesource.com/c/catapult/+/1961011 makes it so that
if you do no specify a --webview-embedder-apk flag then we will use
WebLayerShellSystemWebView.apk for a weblayer browser.

It is also nicer not to explicit specify a flag for the reasons described
in
https://chromium.googlesource.com/chromium/src.git/+/c1324fa4ee0802370abbd624df217ef7b479180c

R=johnchen@chromium.org

Bug: 1028125
Change-Id: I01ac075f8ef92928ca9e15dbb665ea9ce8c95f77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1981068Reviewed-by: default avatarJohn Chen <johnchen@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727484}
parent 8ea90796
...@@ -1283,9 +1283,7 @@ ...@@ -1283,9 +1283,7 @@
"-v", "-v",
"--browser=android-weblayer", "--browser=android-weblayer",
"--upload-results", "--upload-results",
"--test-shard-map-filename=android-pixel2_weblayer-perf_map.json", "--test-shard-map-filename=android-pixel2_weblayer-perf_map.json"
"--webview-embedder-apk=../../out/Release/apks/WebLayerShell.apk",
"--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk"
], ],
"isolate_name": "performance_weblayer_test_suite", "isolate_name": "performance_weblayer_test_suite",
"merge": { "merge": {
......
...@@ -1174,12 +1174,6 @@ def generate_telemetry_args(tester_config, platform): ...@@ -1174,12 +1174,6 @@ def generate_telemetry_args(tester_config, platform):
tester_config['browser']) tester_config['browser'])
if tester_config['platform'].startswith('android'): if tester_config['platform'].startswith('android'):
test_args.append('--device=android') test_args.append('--device=android')
if tester_config['platform'] == 'android-weblayer':
test_args.append(
'--webview-embedder-apk=../../out/Release/apks/WebLayerShell.apk')
test_args.append(
'--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk')
return test_args return test_args
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment