chromium/src
0
Fork 0
Code Activity

Rename monochrome_static_initializers (Reland)

Browse Source 
We no longer build a specific SKU of chrome, but just build and check
against the native target only. As such the monochrome prefix is not
really correct anymore, change to check_chrome_.

This reverts commit 44422d5d4b.

Fix for reland: do not switch infra target name in the same cl.

Bug: 1516670
Change-Id: I484ba409baf94046d09c79d5b1413032ebb8438c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5198422
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Reviewed-by: Sam Maier <smaier@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1247311}
This commit is contained in:
Mohamed Heikal
2024-01-15 22:28:01 +00:00
committed by Chromium LUCI CQ
parent 8ed02f112c
commit dbeb522d3e
3 changed files with 11 additions and 7 deletions

14
chrome/android/BUILD.gn

@ -3051,20 +3051,24 @@ if (current_toolchain == default_toolchain) {
}
if (defined(expected_static_initializer_32bit_count)) {
# Old name alias to be removed after migration is done.
group("monochrome_static_initializers") {
deps = [ ":check_chrome_static_initializers" ]
}
_verify_32bit_static_initializers =
!android_64bit_target_cpu || !skip_secondary_abi_for_cq
_verify_64bit_static_initializers = android_64bit_target_cpu
group("monochrome_static_initializers") {
group("check_chrome_static_initializers") {
deps = []
if (_verify_32bit_static_initializers) {
deps += [ ":chrome_32_static_initializers" ]
deps += [ ":check_chrome_32_static_initializers" ]
}
if (_verify_64bit_static_initializers) {
deps += [ ":chrome_64_static_initializers" ]
deps += [ ":check_chrome_64_static_initializers" ]
}
}
if (_verify_32bit_static_initializers) {
action_with_pydeps("chrome_32_static_initializers") {
action_with_pydeps("check_chrome_32_static_initializers") {
script = "//build/android/gyp/assert_static_initializers.py"
if (android_64bit_target_cpu) {
_lib_abi_toolchain = "($android_secondary_abi_toolchain)"
@ -3087,7 +3091,7 @@ if (current_toolchain == default_toolchain) {
}
}
if (_verify_64bit_static_initializers) {
action_with_pydeps("chrome_64_static_initializers") {
action_with_pydeps("check_chrome_64_static_initializers") {
script = "//build/android/gyp/assert_static_initializers.py"
deps = [ ":libmonochrome_64" ]
inputs = [ "$root_build_dir/lib.unstripped/libmonochrome_64.so" ]

2
chrome/android/static_initializers.gni

@ -8,7 +8,7 @@ import("//components/optimization_guide/features.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//ui/gl/features.gni")
# The monochrome_static_initializers target will cause release bots to fail if
# The check_chrome_static_initializers target will cause release bots to fail if
# the count of static initializers change in either direction. Please try not to
# increase the numbers. If they come from third-party code, please try to update
# the code, or apply a local modification to remove them.

2
docs/static_initializers.md

@ -35,7 +35,7 @@ For Android:
# Build with: is_official_build=true is_chrome_branded=true
# This will dump the list of SI's only when they don't match the expected
# number in static_initializers.gni (this is what the bots use).
ninja chrome/android:monochrome_static_initializers
ninja chrome/android:check_chrome_static_initializers
# or, to dump directly:
tools/linux/dump-static-initializers.py out/Release/lib.unstripped/libmonochrome.so