Commit 62ca70aa authored by Samuel Huang's avatar Samuel Huang Committed by Commit Bot

[Build] Fix android-binary-size by having it build Trichrome.

The main analysis file for android-binary-size has been switched to
Trichrome (from MonochromePublic) crrev.com/c/2545043, which updated
constant.py by changing DEFAULT_SIZE_CONFIG_JSON. Although the file
specifies DEFAULT_ANALYZE_TARGETS and DEFAULT_COMPILE_TARGETS that
includes Trichrome targets, it turns out that android-binary-size's
builder config overrides these values, but does not build Trichrome!

This is causing android-binary-size bot to fail, since Trichrome is
not built.

This CL solves the problem by updating the builder config for
android-binary-size.

Bug: 1040645, 1150128
Change-Id: I5ba8205d44100288f8770345bfa64aadf785d2d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545486Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828449}
parent bf79a642
...@@ -24139,7 +24139,7 @@ buckets { ...@@ -24139,7 +24139,7 @@ buckets {
cipd_version: "refs/heads/master" cipd_version: "refs/heads/master"
cmd: "recipes" cmd: "recipes"
} }
properties: "{\"$build/binary_size\":{\"analyze_targets\":[\"//chrome/android:validate_expectations\",\"//chrome/android:monochrome_public_minimal_apks\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"validate_expectations\"]},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"binary_size_trybot\"}" properties: "{\"$build/binary_size\":{\"analyze_targets\":[\"//chrome/android:monochrome_public_minimal_apks\",\"//chrome/android:trichrome_minimal_apks\",\"//chrome/android:validate_expectations\",\"//tools/binary_size:binary_size_trybot_py\"],\"compile_targets\":[\"monochrome_public_minimal_apks\",\"monochrome_static_initializers\",\"trichrome_minimal_apks\",\"validate_expectations\"]},\"$build/goma\":{\"enable_ats\":true,\"jobs\":150,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.android\",\"recipe\":\"binary_size_trybot\"}"
execution_timeout_secs: 14400 execution_timeout_secs: 14400
expiration_secs: 7200 expiration_secs: 7200
caches { caches {
...@@ -273,13 +273,15 @@ try_.chromium_android_builder( ...@@ -273,13 +273,15 @@ try_.chromium_android_builder(
properties = { properties = {
"$build/binary_size": { "$build/binary_size": {
"analyze_targets": [ "analyze_targets": [
"//chrome/android:validate_expectations",
"//chrome/android:monochrome_public_minimal_apks", "//chrome/android:monochrome_public_minimal_apks",
"//chrome/android:trichrome_minimal_apks",
"//chrome/android:validate_expectations",
"//tools/binary_size:binary_size_trybot_py", "//tools/binary_size:binary_size_trybot_py",
], ],
"compile_targets": [ "compile_targets": [
"monochrome_public_minimal_apks", "monochrome_public_minimal_apks",
"monochrome_static_initializers", "monochrome_static_initializers",
"trichrome_minimal_apks",
"validate_expectations", "validate_expectations",
], ],
}, },
......
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