diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn index 953672b80b481..d1e42b7c025f6 100644 --- a/chrome/android/BUILD.gn +++ b/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" ] diff --git a/chrome/android/static_initializers.gni b/chrome/android/static_initializers.gni index 674dd88ecec2b..b6a566862269c 100644 --- a/chrome/android/static_initializers.gni +++ b/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. diff --git a/docs/static_initializers.md b/docs/static_initializers.md index 3b96079ff456b..a93a0b44a0958 100644 --- a/docs/static_initializers.md +++ b/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