Commit 5ba2c38d authored by Alex Clarke's avatar Alex Clarke Committed by Commit Bot

Perf json config validator to support multiple --webview-embedder-apk

This is needed by WebLayer which has two support APKs.

Change-Id: I638485a711aaf865cdbeed5ec5bfb9e96027c577
Bug: 1022812
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919204Reviewed-by: default avatarJuan Antonio Navarro Pérez <perezju@chromium.org>
Commit-Queue: Alex Clarke <alexclarke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715715}
parent 9b9af27e
...@@ -50,7 +50,7 @@ def _ParseShardMapFileName(args): ...@@ -50,7 +50,7 @@ def _ParseShardMapFileName(args):
def _ParseBrowserFlags(args): def _ParseBrowserFlags(args):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument('--browser') parser.add_argument('--browser')
parser.add_argument('--webview-embedder-apk') parser.add_argument('--webview-embedder-apk', action='append')
options, _ = parser.parse_known_args(args) options, _ = parser.parse_known_args(args)
return options return options
...@@ -92,8 +92,9 @@ def _ValidateBrowserType(builder_name, test_config): ...@@ -92,8 +92,9 @@ def _ValidateBrowserType(builder_name, test_config):
raise ValueError( raise ValueError(
"%s must use 'android-webview', 'android-webview-google' or 'exact' " "%s must use 'android-webview', 'android-webview-google' or 'exact' "
"browser" % builder_name) "browser" % builder_name)
if not browser_options.webview_embedder_apk: if len(browser_options.webview_embedder_apk) != 1:
raise ValueError('%s must set --webview-embedder-apk flag' % builder_name) raise ValueError('%s must set --webview-embedder-apk flag exactly once' %
builder_name)
elif 'Android' in builder_name or 'android' in builder_name: elif 'Android' in builder_name or 'android' in builder_name:
if browser_options.browser not in ( if browser_options.browser not in (
'android-chromium', 'android-chrome', 'exact'): 'android-chromium', 'android-chrome', 'exact'):
......
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