Commit 628e5dd9 authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[Build] Remove "version" field in size config JSON files.

With crrev.com/c/2535582 changing how android-binary-size-generator bot
results on gs:// can be invalidated, the "version" field in size config
JSON files are no longer needed, and can be remove.

This CL needs to wait on the downstream change
  https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/3402103
to land first, to allow template "android_size_bot_config" change.

Bug: 1040645
Change-Id: I4a6af0fce816c4994777db09f48a336b60be47b8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536853Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827561}
parent 24e35fb2
...@@ -81,8 +81,6 @@ template("android_resource_sizes_test") { ...@@ -81,8 +81,6 @@ template("android_resource_sizes_test") {
# to_resource_sizes_py: Scope containing data to pass to resource_sizes.py, # to_resource_sizes_py: Scope containing data to pass to resource_sizes.py,
# processed by generate_commit_size_analysis.py. # processed by generate_commit_size_analysis.py.
# supersize_input_file: Main input for SuperSize. # supersize_input_file: Main input for SuperSize.
# version: Version number, uses to notify build bots that significant changes
# has occurred, so that gs:// should be ignored.
template("android_size_bot_config") { template("android_size_bot_config") {
_full_target_name = get_label_info(target_name, "label_no_toolchain") _full_target_name = get_label_info(target_name, "label_no_toolchain")
_out_json = { _out_json = {
...@@ -92,7 +90,6 @@ template("android_size_bot_config") { ...@@ -92,7 +90,6 @@ template("android_size_bot_config") {
"mapping_files", "mapping_files",
"to_resource_sizes_py", "to_resource_sizes_py",
"supersize_input_file", "supersize_input_file",
"version",
]) ])
} }
_output_json_path = "$root_build_dir/config/${invoker.name}_size_config.json" _output_json_path = "$root_build_dir/config/${invoker.name}_size_config.json"
......
...@@ -3014,7 +3014,6 @@ if (is_official_build) { ...@@ -3014,7 +3014,6 @@ if (is_official_build) {
apk_name = "apks/$_minimal_apks_filename" apk_name = "apks/$_minimal_apks_filename"
} }
supersize_input_file = "apks/$_minimal_apks_filename" supersize_input_file = "apks/$_minimal_apks_filename"
version = "1"
} }
} }
...@@ -3100,7 +3099,6 @@ if (is_official_build) { ...@@ -3100,7 +3099,6 @@ if (is_official_build) {
trichrome_webview = "apks/$_trichrome_webview_basename" trichrome_webview = "apks/$_trichrome_webview_basename"
} }
supersize_input_file = "apks/$_ssargs_filename" supersize_input_file = "apks/$_ssargs_filename"
version = "1"
} }
} }
......
...@@ -91,8 +91,6 @@ def main(): ...@@ -91,8 +91,6 @@ def main():
# * supersize_input_file: Main input for SuperSize, and can be {.apk, # * supersize_input_file: Main input for SuperSize, and can be {.apk,
# .minimal.apks, .ssargs}. If .ssargs, then the file is copied to the # .minimal.apks, .ssargs}. If .ssargs, then the file is copied to the
# staging dir. # staging dir.
# * version: (Unused by this script) Used by build bots to determine whether
# significant binary package restructure has occurred.
# --size-config-json will replace {--apk-name, --mapping-name}. # --size-config-json will replace {--apk-name, --mapping-name}.
parser.add_argument('--size-config-json', parser.add_argument('--size-config-json',
......
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