From 787f2f0eb5ba338e8db5323ea9f015701ea815ce Mon Sep 17 00:00:00 2001 From: Victor Hugo Vianna Silva Date: Thu, 11 Nov 2021 03:27:28 +0000 Subject: [PATCH] [ninjalog uploader] Collect more performance-relevant GN args Collect the Android args from the "Faster Edit/Deploy" section of the build instructions [1], as well as blink_symbol_level. A TODO about collecing enable_js_type_check is deleted, since that argument will disappear in the near future as Chrome migrates to typescript. [1] https://source.chromium.org/chromium/chromium/src/+/main:docs/android_build_instructions.md;l=364;drc=bbc1a1ee3eab2d5e4a5bf7c8b3b7e8d64f83e45d R=tikuta@chromium.org Bug: 1263441 Change-Id: I55dbc37d8543443d8767127523dfa8cb281fce6c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3245375 Auto-Submit: Victor Vianna Commit-Queue: Takuto Ikuta Reviewed-by: Takuto Ikuta --- ninjalog_uploader.py | 13 +++++++------ ninjalog_uploader_wrapper.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ninjalog_uploader.py b/ninjalog_uploader.py index 1f1d98dc0e..3aa0239e63 100755 --- a/ninjalog_uploader.py +++ b/ninjalog_uploader.py @@ -30,12 +30,13 @@ from third_party.six.moves import http_client from third_party.six.moves.urllib import error from third_party.six.moves.urllib import request -# These build configs affect build performance a lot. -# TODO(https://crbug.com/900161): Add 'blink_symbol_level' and -# 'enable_js_type_check'. -WHITELISTED_CONFIGS = ('symbol_level', 'use_goma', 'is_debug', +# These build configs affect build performance. +ALLOWLISTED_CONFIGS = ('symbol_level', 'use_goma', 'is_debug', 'is_component_build', 'enable_nacl', 'host_os', - 'host_cpu', 'target_os', 'target_cpu') + 'host_cpu', 'target_os', 'target_cpu', + 'blink_symbol_level', 'is_java_debug', + 'treat_warnings_as_errors', 'disable_android_lint', + 'use_errorprone_java_compiler', 'incremental_install') def IsGoogler(server): @@ -54,7 +55,7 @@ def ParseGNArgs(gn_args): for config in configs: key = config["name"] - if key not in WHITELISTED_CONFIGS: + if key not in ALLOWLISTED_CONFIGS: continue if 'current' in config: build_configs[key] = config['current']['value'] diff --git a/ninjalog_uploader_wrapper.py b/ninjalog_uploader_wrapper.py index e55fca49a2..fbfca3f296 100755 --- a/ninjalog_uploader_wrapper.py +++ b/ninjalog_uploader_wrapper.py @@ -43,7 +43,7 @@ def SaveConfig(config): def ShowMessage(countdown): whitelisted = '\n'.join( - [' * %s' % config for config in ninjalog_uploader.WHITELISTED_CONFIGS]) + [' * %s' % config for config in ninjalog_uploader.ALLOWLISTED_CONFIGS]) print(""" Your ninjalog will be uploaded to build stats server. The uploaded log will be used to analyze user side build performance.